From 2975b4ef796fd314401f26941990cc4693dab179 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Thu, 9 Feb 2023 11:00:45 +0100
Subject: [PATCH 1/8] Add parser baseline tests.

---
 .../FSharp.Compiler.Service.Tests.fsproj      |   1 +
 tests/service/SyntaxTreeTests.fs              |  66 ++
 .../service/SyntaxTreeTests/SynIdentTests.fs  |  16 +-
 .../data/SyntaxTree/AbstractKeyword.fs        |   2 +
 .../data/SyntaxTree/AbstractKeyword.fs.bsl    |  45 ++
 .../data/SyntaxTree/AbstractMemberKeyword.fs  |   2 +
 .../SyntaxTree/AbstractMemberKeyword.fs.bsl   |  50 ++
 .../SyntaxTree/ActivePatternAsFunction.fs     |   1 +
 .../SyntaxTree/ActivePatternAsFunction.fs.bsl |  25 +
 .../SyntaxTree/ActivePatternDefinition.fs     |   1 +
 .../SyntaxTree/ActivePatternDefinition.fs.bsl |  88 ++
 .../ActivePatternIdentifierInPrivateMember.fs |   6 +
 ...ivePatternIdentifierInPrivateMember.fs.bsl |  99 +++
 tests/service/data/SyntaxTree/AndKeyword.fs   |   2 +
 .../service/data/SyntaxTree/AndKeyword.fs.bsl |  76 ++
 ...ttributesInOptionalNamedMemberParameter.fs |   2 +
 ...butesInOptionalNamedMemberParameter.fs.bsl | 112 +++
 ...BlockCommentInSourceCode,SignatureFile.fsi |   3 +
 ...kCommentInSourceCode,SignatureFile.fsi.bsl |  31 +
 .../SyntaxTree/BlockCommentInSourceCode.fs    |   1 +
 .../BlockCommentInSourceCode.fs.bsl           |  48 ++
 .../ColonBeforeReturnTypeIsPartOfTrivia.fs    |   1 +
 ...ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl |  57 ++
 ...oreReturnTypeIsPartOfTriviaInProperties.fs |   2 +
 ...eturnTypeIsPartOfTriviaInProperties.fs.bsl | 156 ++++
 .../CommentAfterSourceCode,SignatureFile.fsi  |   3 +
 ...mmentAfterSourceCode,SignatureFile.fsi.bsl |  30 +
 .../data/SyntaxTree/CommentAfterSourceCode.fs |   1 +
 .../SyntaxTree/CommentAfterSourceCode.fs.bsl  |  17 +
 .../data/SyntaxTree/CommentAtEndOfFile.fs     |   1 +
 .../data/SyntaxTree/CommentAtEndOfFile.fs.bsl |  12 +
 .../SyntaxTree/CommentBetweenElseAndIf.fs     |   4 +
 .../SyntaxTree/CommentBetweenElseAndIf.fs.bsl |  36 +
 .../CommentOnSingleLine,SignatureFile.fsi     |   3 +
 .../CommentOnSingleLine,SignatureFile.fsi.bsl |  13 +
 .../data/SyntaxTree/CommentOnSingleLine.fs    |   2 +
 .../SyntaxTree/CommentOnSingleLine.fs.bsl     |  17 +
 .../ComplexArgumentsLambdaHasArrowRange.fs    |   5 +
 ...ComplexArgumentsLambdaHasArrowRange.fs.bsl | 243 ++++++
 ...ConditionalDirectiveAroundInlineKeyword.fs |   5 +
 ...itionalDirectiveAroundInlineKeyword.fs.bsl |  80 ++
 ...angeOfTheEqualsSignInSynExprRecordField.fs |   4 +
 ...OfTheEqualsSignInSynExprRecordField.fs.bsl |  33 +
 .../SyntaxTree/CustomOperatorDefinition.fs    |   1 +
 .../CustomOperatorDefinition.fs.bsl           |  55 ++
 ...spaceRangeShouldStartAtNamespaceKeyword.fs |   4 +
 ...eRangeShouldStartAtNamespaceKeyword.fs.bsl |  39 +
 .../data/SyntaxTree/DeeplyNestedIfThenElse.fs |   9 +
 .../SyntaxTree/DeeplyNestedIfThenElse.fs.bsl  |  48 ++
 .../data/SyntaxTree/DefaultKeyword.fsi        |   4 +
 .../data/SyntaxTree/DefaultKeyword.fsi.bsl    |  44 +
 .../data/SyntaxTree/DefaultValKeyword.fs      |   2 +
 .../data/SyntaxTree/DefaultValKeyword.fs.bsl  |  51 ++
 .../DestructedLambdaHasArrowRange.fs          |   1 +
 .../DestructedLambdaHasArrowRange.fs.bsl      | 101 +++
 ...etectDifferenceBetweenCompiledOperators.fs |   2 +
 ...tDifferenceBetweenCompiledOperators.fs.bsl |  41 +
 ...ntAreNotReportedAsTrivia,SignatureFile.fsi |   9 +
 ...eNotReportedAsTrivia,SignatureFile.fsi.bsl |  37 +
 ...nMultilineCommentAreNotReportedAsTrivia.fs |   7 +
 ...tilineCommentAreNotReportedAsTrivia.fs.bsl |  41 +
 ...ngAreNotReportedAsTrivia,SignatureFile.fsi |   8 +
 ...eNotReportedAsTrivia,SignatureFile.fsi.bsl |  13 +
 ...InMultilineStringAreNotReportedAsTrivia.fs |   6 +
 ...ltilineStringAreNotReportedAsTrivia.fs.bsl |  37 +
 tests/service/data/SyntaxTree/DoKeyword.fs    |   2 +
 .../service/data/SyntaxTree/DoKeyword.fs.bsl  |  36 +
 .../data/SyntaxTree/DoStaticKeyword.fs        |   2 +
 .../data/SyntaxTree/DoStaticKeyword.fs.bsl    |  41 +
 .../ElseKeywordInSimpleIfThenElse.fs          |   1 +
 .../ElseKeywordInSimpleIfThenElse.fs.bsl      |  25 +
 .../EqualsTokenIsPresentInSynValSigMember.fsi |   4 +
 ...alsTokenIsPresentInSynValSigMember.fsi.bsl |  62 ++
 .../EqualsTokenIsPresentInSynValSigValue.fsi  |   3 +
 ...ualsTokenIsPresentInSynValSigValue.fsi.bsl |  32 +
 .../service/data/SyntaxTree/ExternKeyword.fs  |   1 +
 .../data/SyntaxTree/ExternKeyword.fs.bsl      |  52 ++
 .../ExternKeywordIsPresentInTrivia.fs         |   1 +
 .../ExternKeywordIsPresentInTrivia.fs.bsl     |  60 ++
 .../GetSetMemberWithInlineKeyword.fs          |   4 +
 .../GetSetMemberWithInlineKeyword.fs.bsl      | 131 +++
 .../GlobalInOpenPathShouldContainTrivia.fs    |   3 +
 ...GlobalInOpenPathShouldContainTrivia.fs.bsl |  20 +
 .../data/SyntaxTree/GlobalKeywordAsSynExpr.fs |   1 +
 .../SyntaxTree/GlobalKeywordAsSynExpr.fs.bsl  |  17 +
 ...lNamespaceShouldStartAtNamespaceKeyword.fs |   5 +
 ...espaceShouldStartAtNamespaceKeyword.fs.bsl |  41 +
 ...NamespaceShouldStartAtNamespaceKeyword.fsi |   5 +
 ...spaceShouldStartAtNamespaceKeyword.fsi.bsl |  65 ++
 .../If,ThenAndElseKeywordOnSeparateLines.fs   |   3 +
 ...f,ThenAndElseKeywordOnSeparateLines.fs.bsl |  27 +
 .../data/SyntaxTree/IfKeywordInIfThenElse.fs  |   1 +
 .../SyntaxTree/IfKeywordInIfThenElse.fs.bsl   |  21 +
 .../SyntaxTree/ImplicitCtorWithAsKeyword.fs   |   7 +
 .../ImplicitCtorWithAsKeyword.fs.bsl          | 100 +++
 .../service/data/SyntaxTree/InHeadPattern.fs  |   1 +
 .../data/SyntaxTree/InHeadPattern.fs.bsl      |  39 +
 .../data/SyntaxTree/IncompleteLongIdent.fs    |   3 +
 .../SyntaxTree/IncompleteLongIdent.fs.bsl     |  17 +
 .../service/data/SyntaxTree/InfixOperation.fs |   1 +
 .../data/SyntaxTree/InfixOperation.fs.bsl     |  24 +
 ...angeOfTheEqualsSignInSynExprRecordField.fs |   1 +
 ...OfTheEqualsSignInSynExprRecordField.fs.bsl |  44 +
 .../service/data/SyntaxTree/InlineKeyword.fsi |   3 +
 .../data/SyntaxTree/InlineKeyword.fsi.bsl     |  26 +
 .../data/SyntaxTree/InlineKeywordInBinding.fs |   3 +
 .../SyntaxTree/InlineKeywordInBinding.fs.bsl  |  73 ++
 ...leParameterWithWildCardGivesCorrectBody.fs |   1 +
 ...rameterWithWildCardGivesCorrectBody.fs.bsl |  71 ++
 ...LambdaWithTwoParametersGivesCorrectBody.fs |   1 +
 ...daWithTwoParametersGivesCorrectBody.fs.bsl |  44 +
 ...daWithWildCardParameterGivesCorrectBody.fs |   1 +
 ...thWildCardParameterGivesCorrectBody.fs.bsl |  58 ++
 ...dCardThatReturnsALambdaGivesCorrectBody.fs |   1 +
 ...dThatReturnsALambdaGivesCorrectBody.fs.bsl |  61 ++
 .../LeadingKeywordInRecursiveTypes.fsi        |   2 +
 .../LeadingKeywordInRecursiveTypes.fsi.bsl    |  46 ++
 tests/service/data/SyntaxTree/LetKeyword.fs   |   1 +
 .../service/data/SyntaxTree/LetKeyword.fs.bsl |  42 +
 .../service/data/SyntaxTree/LetRecKeyword.fs  |   1 +
 .../data/SyntaxTree/LetRecKeyword.fs.bsl      |  45 ++
 .../MeasureContainsTheRangeOfTheConstant.fs   |   2 +
 ...easureContainsTheRangeOfTheConstant.fs.bsl |  73 ++
 .../service/data/SyntaxTree/MemberKeyword.fs  |   2 +
 .../data/SyntaxTree/MemberKeyword.fs.bsl      |  56 ++
 ...ShouldContainsTheRangeOfTheWithKeyword.fsi |   4 +
 ...ldContainsTheRangeOfTheWithKeyword.fsi.bsl |  66 ++
 .../data/SyntaxTree/MemberValKeyword.fs       |   2 +
 .../data/SyntaxTree/MemberValKeyword.fs.bsl   |  50 ++
 .../SyntaxTree/MemberWithInlineKeyword.fs     |   2 +
 .../SyntaxTree/MemberWithInlineKeyword.fs.bsl |  69 ++
 .../ModuleRangeShouldStartAtFirstAttribute.fs |   4 +
 ...uleRangeShouldStartAtFirstAttribute.fs.bsl |  60 ++
 ...ModuleRangeShouldStartAtFirstAttribute.fsi |   4 +
 ...leRangeShouldStartAtFirstAttribute.fsi.bsl |  39 +
 .../ModuleShouldContainModuleKeyword.fs       |  12 +
 .../ModuleShouldContainModuleKeyword.fs.bsl   |  86 ++
 .../ModuleShouldContainModuleKeyword.fsi      |   3 +
 .../ModuleShouldContainModuleKeyword.fsi.bsl  |  25 +
 .../MultilineLambdaHasArrowRange.fs           |   3 +
 .../MultilineLambdaHasArrowRange.fs.bsl       | 108 +++
 ...veARangeThatStartsAtTheNamespaceKeyword.fs |   8 +
 ...angeThatStartsAtTheNamespaceKeyword.fs.bsl |  68 ++
 ...tipleSynEnumCaseContainsRangeOfConstant.fs |   3 +
 ...eSynEnumCaseContainsRangeOfConstant.fs.bsl |  56 ++
 .../MultipleSynEnumCasesHaveBarRange.fs       |   3 +
 .../MultipleSynEnumCasesHaveBarRange.fs.bsl   |  53 ++
 ...eThatStartsAtAnd!AndEndsAfterExpression.fs |   6 +
 ...tStartsAtAnd!AndEndsAfterExpression.fs.bsl |  79 ++
 .../MultipleSynUnionCasesHaveBarRange.fs      |   3 +
 .../MultipleSynUnionCasesHaveBarRange.fs.bsl  |  64 ++
 .../service/data/SyntaxTree/NamedParameter.fs |   1 +
 .../data/SyntaxTree/NamedParameter.fs.bsl     |  30 +
 .../NamedParametersInDelegateType.fs          |   1 +
 .../NamedParametersInDelegateType.fs.bsl      | 114 +++
 .../service/data/SyntaxTree/NameofOperator.fs |   1 +
 .../data/SyntaxTree/NameofOperator.fs.bsl     |  23 +
 .../NamespaceShouldContainNamespaceKeyword.fs |   3 +
 ...espaceShouldContainNamespaceKeyword.fs.bsl |  52 ++
 ...NamespaceShouldContainNamespaceKeyword.fsi |   3 +
 ...spaceShouldContainNamespaceKeyword.fsi.bsl |  42 +
 .../data/SyntaxTree/NestedElifInIfThenElse.fs |   3 +
 .../SyntaxTree/NestedElifInIfThenElse.fs.bsl  |  33 +
 .../SyntaxTree/NestedElseIfInIfThenElse.fs    |   4 +
 .../NestedElseIfInIfThenElse.fs.bsl           |  35 +
 .../NestedElseIfOnTheSameLineInIfThenElse.fs  |   4 +
 ...stedElseIfOnTheSameLineInIfThenElse.fs.bsl |  43 +
 .../NestedIfElseEndif,SignatureFile.fsi       |  12 +
 .../NestedIfElseEndif,SignatureFile.fsi.bsl   |  38 +
 .../data/SyntaxTree/NestedIfElseEndif.fs      |  10 +
 .../data/SyntaxTree/NestedIfElseEndif.fs.bsl  |  33 +
 ...ifWithComplexExpressions,SignatureFile.fsi |  11 +
 ...thComplexExpressions,SignatureFile.fsi.bsl |  49 ++
 .../NestedIfEndifWithComplexExpressions.fs    |   8 +
 ...NestedIfEndifWithComplexExpressions.fs.bsl |  46 ++
 ...ExprLetOrUseContainsTheRangeOfInKeyword.fs |   4 +
 ...LetOrUseContainsTheRangeOfInKeyword.fs.bsl | 116 +++
 .../NestedSynTypeOrInsideSynExprTraitCall.fs  |   1 +
 ...stedSynTypeOrInsideSynExprTraitCall.fs.bsl | 152 ++++
 ...NestedTypeHasStaticTypeAsLeadingKeyword.fs |   4 +
 ...edTypeHasStaticTypeAsLeadingKeyword.fs.bsl |  52 ++
 ...estedTypeHasStaticTypeAsLeadingKeyword.fsi |   4 +
 ...dTypeHasStaticTypeAsLeadingKeyword.fsi.bsl |  51 ++
 tests/service/data/SyntaxTree/NewKeyword.fs   |   2 +
 .../service/data/SyntaxTree/NewKeyword.fs.bsl |  72 ++
 ...InASingleSynMatchClauseInSynExprTryWith.fs |   5 +
 ...ingleSynMatchClauseInSynExprTryWith.fs.bsl |  52 ++
 .../SyntaxTree/ObjectModelWithTwoMembers.fs   |   3 +
 .../ObjectModelWithTwoMembers.fs.bsl          | 161 ++++
 .../data/SyntaxTree/OperatorAsFunction.fs     |   1 +
 .../data/SyntaxTree/OperatorAsFunction.fs.bsl |  28 +
 .../data/SyntaxTree/OperatorInMatchPattern.fs |   2 +
 .../SyntaxTree/OperatorInMatchPattern.fs.bsl  |  38 +
 .../SyntaxTree/OperatorInMemberDefinition.fs  |   2 +
 .../OperatorInMemberDefinition.fs.bsl         |  87 ++
 .../SyntaxTree/OperatorInSynPatLongIdent.fs   |   1 +
 .../OperatorInSynPatLongIdent.fs.bsl          |  55 ++
 .../SyntaxTree/OperatorNameInSynValSig.fsi    |   2 +
 .../OperatorNameInSynValSig.fsi.bsl           |  50 ++
 .../OperatorNameInValConstraint.fsi           |  11 +
 .../OperatorNameInValConstraint.fsi.bsl       | 110 +++
 .../data/SyntaxTree/OptionalExpression.fs     |   1 +
 .../data/SyntaxTree/OptionalExpression.fs.bsl |  33 +
 .../data/SyntaxTree/OverrideKeyword.fs        |   2 +
 .../data/SyntaxTree/OverrideKeyword.fs.bsl    |  64 ++
 .../data/SyntaxTree/OverrideValKeyword.fs     |   2 +
 .../data/SyntaxTree/OverrideValKeyword.fs.bsl |  52 ++
 .../ParenthesesOfSynArgPatsNamePatPairs.fs    |   5 +
 ...ParenthesesOfSynArgPatsNamePatPairs.fs.bsl |  67 ++
 .../PartialActivePatternAsFunction.fs         |   1 +
 .../PartialActivePatternAsFunction.fs.bsl     |  28 +
 .../PartialActivePatternDefinition.fs         |   1 +
 .../PartialActivePatternDefinition.fs.bsl     |  88 ++
 ...ctivePatternDefinitionWithoutParameters.fs |   1 +
 ...ePatternDefinitionWithoutParameters.fs.bsl |  47 ++
 .../data/SyntaxTree/PrefixOperation.fs        |   1 +
 .../data/SyntaxTree/PrefixOperation.fs.bsl    |  20 +
 .../PrefixOperationWithTwoCharacters.fs       |   1 +
 .../PrefixOperationWithTwoCharacters.fs.bsl   |  21 +
 .../data/SyntaxTree/PrivateKeywordHasRange.fs |   8 +
 .../SyntaxTree/PrivateKeywordHasRange.fs.bsl  |  50 ++
 .../SyntaxTree/QualifiedOperatorExpression.fs |   1 +
 .../QualifiedOperatorExpression.fs.bsl        |  59 ++
 ...rReturnsRangeOfSynModuleOrNamespaceSig.fsi |   3 +
 ...urnsRangeOfSynModuleOrNamespaceSig.fsi.bsl |  61 ++
 .../RangeOfArrowInSynMatchClause.fs           |   2 +
 .../RangeOfArrowInSynMatchClause.fs.bsl       |  37 +
 ...geOfArrowInSynMatchClauseWithWhenClause.fs |   2 +
 ...ArrowInSynMatchClauseWithWhenClause.fs.bsl |  51 ++
 .../data/SyntaxTree/RangeOfAttribute.fs       |   2 +
 .../data/SyntaxTree/RangeOfAttribute.fs.bsl   |  44 +
 ...tternShouldBeIncludedInSynModuleDeclLet.fs |   1 +
 ...nShouldBeIncludedInSynModuleDeclLet.fs.bsl |  59 ++
 ...ouldBeIncludedInBindingOfSynExprObjExpr.fs |   3 +
 ...BeIncludedInBindingOfSynExprObjExpr.fs.bsl |  88 ++
 ...onstructorSynMemberDefnMember,OptAsSpec.fs |   3 +
 ...ructorSynMemberDefnMember,OptAsSpec.fs.bsl |  85 ++
 ...ncludedInConstructorSynMemberDefnMember.fs |   3 +
 ...dedInConstructorSynMemberDefnMember.fs.bsl |  84 ++
 ...cludedInFullSynMemberDefnMemberProperty.fs |   5 +
 ...edInFullSynMemberDefnMemberProperty.fs.bsl | 158 ++++
 ...eShouldBeIncludedInSecondaryConstructor.fs |  10 +
 ...uldBeIncludedInSecondaryConstructor.fs.bsl | 189 +++++
 ...SynExceptionDefnReprAndSynExceptionSig.fsi |   5 +
 ...xceptionDefnReprAndSynExceptionSig.fsi.bsl |  68 ++
 ...uldBeIncludedInSynMemberDefnLetBindings.fs |   3 +
 ...eIncludedInSynMemberDefnLetBindings.fs.bsl |  73 ++
 ...teShouldBeIncludedInSynMemberDefnMember.fs |   3 +
 ...ouldBeIncludedInSynMemberDefnMember.fs.bsl |  86 ++
 ...ibuteShouldBeIncludedInSynModuleDeclLet.fs |   2 +
 ...eShouldBeIncludedInSynModuleDeclLet.fs.bsl |  50 ++
 ...ldBeIncludedInSynModuleDeclNestedModule.fs |   5 +
 ...IncludedInSynModuleDeclNestedModule.fs.bsl |  45 ++
 ...IncludedInSynModuleSigDeclNestedModule.fsi |   5 +
 ...udedInSynModuleSigDeclNestedModule.fsi.bsl |  55 ++
 ...fAttributeShouldBeIncludedInSynTypeDefn.fs |   4 +
 ...ributeShouldBeIncludedInSynTypeDefn.fs.bsl |  43 +
 ...ributeShouldBeIncludedInSynTypeDefnSig.fsi |   6 +
 ...teShouldBeIncludedInSynTypeDefnSig.fsi.bsl |  46 ++
 ...eShouldBeIncludedInSynValSpfnAndMember.fsi |   5 +
 ...uldBeIncludedInSynValSpfnAndMember.fsi.bsl |  72 ++
 ...dInWriteOnlySynMemberDefnMemberProperty.fs |   3 +
 ...riteOnlySynMemberDefnMemberProperty.fs.bsl | 103 +++
 .../SyntaxTree/RangeOfAttributeWithPath.fs    |   2 +
 .../RangeOfAttributeWithPath.fs.bsl           |  50 ++
 .../SyntaxTree/RangeOfAttributeWithTarget.fs  |   2 +
 .../RangeOfAttributeWithTarget.fs.bsl         |  46 ++
 ...ributesShouldBeIncludedInRecursiveTypes.fs |   9 +
 ...tesShouldBeIncludedInRecursiveTypes.fs.bsl | 170 ++++
 ...ibutesShouldBeIncludedInRecursiveTypes.fsi |  11 +
 ...esShouldBeIncludedInRecursiveTypes.fsi.bsl | 115 +++
 ...MultipleSynMatchClausesInSynExprTryWith.fs |   7 +
 ...ipleSynMatchClausesInSynExprTryWith.fs.bsl |  76 ++
 ...arInASingleSynMatchClauseInSynExprMatch.fs |   2 +
 ...ASingleSynMatchClauseInSynExprMatch.fs.bsl |  52 ++
 ...InASingleSynMatchClauseInSynExprTryWith.fs |   4 +
 ...ingleSynMatchClauseInSynExprTryWith.fs.bsl |  50 ++
 ...InMultipleSynMatchClausesInSynExprMatch.fs |   3 +
 ...ltipleSynMatchClausesInSynExprMatch.fs.bsl |  76 ++
 ...EqualSignShouldBePresent,SignatureFile.fsi |   4 +
 ...lSignShouldBePresent,SignatureFile.fsi.bsl |  42 +
 .../RangeOfEqualSignShouldBePresent.fs        |   2 +
 .../RangeOfEqualSignShouldBePresent.fs.bsl    |  26 +
 ...nShouldBePresentInLocalLetBinding,Typed.fs |   3 +
 ...uldBePresentInLocalLetBinding,Typed.fs.bsl |  57 ++
 ...ualSignShouldBePresentInLocalLetBinding.fs |   3 +
 ...ignShouldBePresentInLocalLetBinding.fs.bsl |  46 ++
 ...BePresentInMemberBinding,WithParameters.fs |   2 +
 ...esentInMemberBinding,WithParameters.fs.bsl |  91 +++
 ...BePresentInMemberBinding,WithReturnType.fs |   2 +
 ...esentInMemberBinding,WithReturnType.fs.bsl | 103 +++
 ...EqualSignShouldBePresentInMemberBinding.fs |   2 +
 ...lSignShouldBePresentInMemberBinding.fs.bsl |  81 ++
 ...ngeOfEqualSignShouldBePresentInProperty.fs |   4 +
 ...fEqualSignShouldBePresentInProperty.fs.bsl | 147 ++++
 ...ePresentInSynModuleDeclLetBinding,Typed.fs |   1 +
 ...sentInSynModuleDeclLetBinding,Typed.fs.bsl |  49 ++
 ...houldBePresentInSynModuleDeclLetBinding.fs |   1 +
 ...dBePresentInSynModuleDeclLetBinding.fs.bsl |  38 +
 ...ShouldBePresentInSynExprLetOrUseBinding.fs |   3 +
 ...ldBePresentInSynExprLetOrUseBinding.fs.bsl |  67 ++
 ...houldBePresentInSynModuleDeclLetBinding.fs |   1 +
 ...dBePresentInSynModuleDeclLetBinding.fs.bsl |  39 +
 ...InSynModuleDeclLetBindingWithAttributes.fs |   4 +
 ...nModuleDeclLetBindingWithAttributes.fs.bsl |  55 ++
 ...ceptionSigAndSynModuleSigDeclException.fsi |   6 +
 ...ionSigAndSynModuleSigDeclException.fsi.bsl |  80 ++
 .../RangeOfMultipleSynMatchClause.fs          |   9 +
 .../RangeOfMultipleSynMatchClause.fs.bsl      |  87 ++
 ...FileShouldEndAtTheLastSynModuleSigDecl.fsi |  60 ++
 ...ShouldEndAtTheLastSynModuleSigDecl.fsi.bsl | 757 ++++++++++++++++++
 .../SyntaxTree/RangeOfSingleSynMatchClause.fs |   6 +
 .../RangeOfSingleSynMatchClause.fs.bsl        |  73 ++
 ...angeOfSingleSynMatchClauseFollowedByBar.fs |   7 +
 ...OfSingleSynMatchClauseFollowedByBar.fs.bsl |  73 ++
 ...geOfSingleSynMatchClauseWithMissingBody.fs |   5 +
 ...SingleSynMatchClauseWithMissingBody.fs.bsl |  71 ++
 ...ynMatchClauseWithMissingBodyAndWhenExpr.fs |   5 +
 ...tchClauseWithMissingBodyAndWhenExpr.fs.bsl |  81 ++
 ...peDefnSigDelegateOfShouldStartFromName.fsi |   3 +
 ...fnSigDelegateOfShouldStartFromName.fsi.bsl |  70 ++
 ...efnSigObjectModelShouldEndAtLastMember.fsi |   5 +
 ...igObjectModelShouldEndAtLastMember.fsi.bsl |  63 ++
 ...TypeDefnSigRecordShouldEndAtLastMember.fsi |   4 +
 ...DefnSigRecordShouldEndAtLastMember.fsi.bsl |  72 ++
 ...SynTypeDefnSigSimpleShouldEndAtLastVal.fsi |   4 +
 ...ypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl |  63 ++
 .../RangeOfTypeShouldEndAtEndKeyword.fsi      |   8 +
 .../RangeOfTypeShouldEndAtEndKeyword.fsi.bsl  |  31 +
 ...nMemberContainsTheRangeOfTheWithKeyword.fs |   3 +
 ...berContainsTheRangeOfTheWithKeyword.fs.bsl | 107 +++
 ...nMemberContainsTheRangeOfTheWithKeyword.fs |   5 +
 ...berContainsTheRangeOfTheWithKeyword.fs.bsl | 154 ++++
 ...ularStringAsParsedHashDirectiveArgument.fs |   1 +
 ...StringAsParsedHashDirectiveArgument.fs.bsl |  16 +
 .../SyntaxTree/SignatureMemberWithGet.fsi     |   7 +
 .../SyntaxTree/SignatureMemberWithGet.fsi.bsl |  55 ++
 .../SyntaxTree/SignatureMemberWithSet,get.fsi |   7 +
 .../SignatureMemberWithSet,get.fsi.bsl        |  60 ++
 .../SyntaxTree/SignatureMemberWithSet.fsi     |   7 +
 .../SyntaxTree/SignatureMemberWithSet.fsi.bsl |  55 ++
 .../SyntaxTree/SimpleLambdaHasArrowRange.fs   |   1 +
 .../SimpleLambdaHasArrowRange.fs.bsl          |  26 +
 .../SingleIfElseEndif,SignatureFile.fsi       |   8 +
 .../SingleIfElseEndif,SignatureFile.fsi.bsl   |  35 +
 .../data/SyntaxTree/SingleIfElseEndif.fs      |   6 +
 .../data/SyntaxTree/SingleIfElseEndif.fs.bsl  |  30 +
 .../SingleIfEndif,SignatureFile.fsi           |   7 +
 .../SingleIfEndif,SignatureFile.fsi.bsl       |  31 +
 .../service/data/SyntaxTree/SingleIfEndif.fs  |   5 +
 .../data/SyntaxTree/SingleIfEndif.fs.bsl      |  28 +
 ...ingleSynEnumCaseContainsRangeOfConstant.fs |   1 +
 ...eSynEnumCaseContainsRangeOfConstant.fs.bsl |  42 +
 .../SingleSynEnumCaseHasBarRange.fs           |   1 +
 .../SingleSynEnumCaseHasBarRange.fs.bsl       |  41 +
 .../SyntaxTree/SingleSynEnumCaseWithoutBar.fs |   1 +
 .../SingleSynEnumCaseWithoutBar.fs.bsl        |  38 +
 .../SingleSynTypeInsideSynExprTraitCall.fs    |   3 +
 ...SingleSynTypeInsideSynExprTraitCall.fs.bsl | 230 ++++++
 .../SingleSynUnionCaseHasBarRange.fs          |   1 +
 .../SingleSynUnionCaseHasBarRange.fs.bsl      |  47 ++
 .../SingleSynUnionCaseWithoutBar.fs           |   1 +
 .../SingleSynUnionCaseWithoutBar.fs.bsl       |  45 ++
 ...IdentifierAsParsedHashDirectiveArgument.fs |   1 +
 ...tifierAsParsedHashDirectiveArgument.fs.bsl |  19 +
 .../data/SyntaxTree/StaticAbstractKeyword.fs  |   2 +
 .../SyntaxTree/StaticAbstractKeyword.fs.bsl   |  56 ++
 .../SyntaxTree/StaticAbstractMemberKeyword.fs |   2 +
 .../StaticAbstractMemberKeyword.fs.bsl        |  59 ++
 .../data/SyntaxTree/StaticLetKeyword.fs       |   2 +
 .../data/SyntaxTree/StaticLetKeyword.fs.bsl   |  48 ++
 .../data/SyntaxTree/StaticLetRecKeyword.fs    |   2 +
 .../SyntaxTree/StaticLetRecKeyword.fs.bsl     |  60 ++
 .../data/SyntaxTree/StaticMemberKeyword.fs    |   2 +
 .../SyntaxTree/StaticMemberKeyword.fs.bsl     |  65 ++
 .../data/SyntaxTree/StaticMemberValKeyword.fs |   2 +
 .../SyntaxTree/StaticMemberValKeyword.fs.bsl  |  56 ++
 .../data/SyntaxTree/StaticValKeyword.fsi      |   4 +
 .../data/SyntaxTree/StaticValKeyword.fsi.bsl  |  41 +
 ...PatPairsContainsTheRangeOfTheEqualsSign.fs |   2 +
 ...airsContainsTheRangeOfTheEqualsSign.fs.bsl |  47 ++
 ...nConstBytesWithSynByteStringKindRegular.fs |   1 +
 ...stBytesWithSynByteStringKindRegular.fs.bsl |  38 +
 ...ConstBytesWithSynByteStringKindVerbatim.fs |   1 +
 ...tBytesWithSynByteStringKindVerbatim.fs.bsl |  38 +
 .../SynConstStringWithSynStringKindRegular.fs |   1 +
 ...ConstStringWithSynStringKindRegular.fs.bsl |  38 +
 ...ConstStringWithSynStringKindTripleQuote.fs |   1 +
 ...tStringWithSynStringKindTripleQuote.fs.bsl |  36 +
 ...SynConstStringWithSynStringKindVerbatim.fs |   1 +
 ...onstStringWithSynStringKindVerbatim.fs.bsl |  38 +
 ...nShouldContainsTheRangeOfTheWithKeyword.fs |   4 +
 ...uldContainsTheRangeOfTheWithKeyword.fs.bsl |  66 ++
 ...ShouldContainsTheRangeOfTheWithKeyword.fsi |   4 +
 ...ldContainsTheRangeOfTheWithKeyword.fsi.bsl |  57 ++
 ...RangeStartsAtAnd!AndEndsAfterExpression.fs |   7 +
 ...eStartsAtAnd!AndEndsAfterExpression.fs.bsl |  58 ++
 .../SynExprAnonRecdWithStructKeyword.fs       |   6 +
 .../SynExprAnonRecdWithStructKeyword.fs.bsl   |  26 +
 ...tainsTheRangeOfTheEqualsSignInTheFields.fs |   3 +
 ...sTheRangeOfTheEqualsSignInTheFields.fs.bsl |  37 +
 ...SynExprDoContainsTheRangeOfTheDoKeyword.fs |   5 +
 ...xprDoContainsTheRangeOfTheDoKeyword.fs.bsl |  41 +
 .../SynExprDynamicDoesContainIdent.fs         |   1 +
 .../SynExprDynamicDoesContainIdent.fs.bsl     |  16 +
 .../SynExprDynamicDoesContainParentheses.fs   |   1 +
 ...ynExprDynamicDoesContainParentheses.fs.bsl |  23 +
 ...nExprForContainsTheRangeOfTheEqualsSign.fs |   2 +
 ...rForContainsTheRangeOfTheEqualsSign.fs.bsl |  41 +
 ...erpolatedStringWithSynStringKindRegular.fs |   1 +
 ...latedStringWithSynStringKindRegular.fs.bsl |  48 ++
 ...latedStringWithSynStringKindTripleQuote.fs |   1 +
 ...dStringWithSynStringKindTripleQuote.fs.bsl |  38 +
 ...rpolatedStringWithSynStringKindVerbatim.fs |   1 +
 ...atedStringWithSynStringKindVerbatim.fs.bsl |  49 ++
 ...rUseBangContainsTheRangeOfTheEqualsSign.fs |   5 +
 ...BangContainsTheRangeOfTheEqualsSign.fs.bsl |  56 ++
 ...ExprLetOrUseContainsTheRangeOfInKeyword.fs |   1 +
 ...LetOrUseContainsTheRangeOfInKeyword.fs.bsl |  45 ++
 ...tOrUseDoesNotContainTheRangeOfInKeyword.fs |   3 +
 ...seDoesNotContainTheRangeOfInKeyword.fs.bsl |  46 ++
 ...actersDoesNotContainTheRangeOfInKeyword.fs |   3 +
 ...rsDoesNotContainTheRangeOfInKeyword.fs.bsl |  69 ++
 ...rsiveBindingContainsTheRangeOfInKeyword.fs |   4 +
 ...eBindingContainsTheRangeOfInKeyword.fs.bsl |  74 ++
 ...ontainsTheRangeOfTheMatchAndWithKeyword.fs |   2 +
 ...insTheRangeOfTheMatchAndWithKeyword.fs.bsl |  37 +
 ...ontainsTheRangeOfTheMatchAndWithKeyword.fs |   2 +
 ...insTheRangeOfTheMatchAndWithKeyword.fs.bsl |  37 +
 ...xprObjExprContainsTheRangeOfWithKeyword.fs |   5 +
 ...bjExprContainsTheRangeOfWithKeyword.fs.bsl | 141 ++++
 .../SynExprObjMembersHaveCorrectKeywords.fs   |   6 +
 ...ynExprObjMembersHaveCorrectKeywords.fs.bsl | 169 ++++
 .../data/SyntaxTree/SynExprObjWithSetter.fs   |   6 +
 .../SyntaxTree/SynExprObjWithSetter.fs.bsl    | 138 ++++
 ...angeOfTheEqualsSignInSynExprRecordField.fs |   6 +
 ...OfTheEqualsSignInSynExprRecordField.fs.bsl |  48 ++
 ...ecordFieldsContainCorrectAmountOfTrivia.fs |   4 +
 ...dFieldsContainCorrectAmountOfTrivia.fs.bsl |  79 ++
 .../SynExprSetWithSynExprDynamic.fs           |   1 +
 .../SynExprSetWithSynExprDynamic.fs.bsl       |  19 +
 ...yContainsTheRangeOfTheTryAndWithKeyword.fs |   4 +
 ...tainsTheRangeOfTheTryAndWithKeyword.fs.bsl |  29 +
 ...hContainsTheRangeOfTheTryAndWithKeyword.fs |   4 +
 ...tainsTheRangeOfTheTryAndWithKeyword.fs.bsl |  43 +
 .../SynMeasureParenHasCorrectRange.fs         |   1 +
 .../SynMeasureParenHasCorrectRange.fs.bsl     |  37 +
 ...MemberDefnAbstractSlotHasCorrectKeyword.fs |   3 +
 ...erDefnAbstractSlotHasCorrectKeyword.fs.bsl |  80 ++
 ...MemberDefnAutoPropertyHasCorrectKeyword.fs |   5 +
 ...erDefnAutoPropertyHasCorrectKeyword.fs.bsl | 152 ++++
 ...terfaceContainsTheRangeOfTheWithKeyword.fs |   4 +
 ...aceContainsTheRangeOfTheWithKeyword.fs.bsl | 103 +++
 ...erDefnMemberSynValDataHasCorrectKeyword.fs |   5 +
 ...fnMemberSynValDataHasCorrectKeyword.fs.bsl | 195 +++++
 .../SynMemberSigMemberHasCorrectKeywords.fsi  |   9 +
 ...nMemberSigMemberHasCorrectKeywords.fsi.bsl | 177 ++++
 .../SynPatOrContainsTheRangeOfTheBar.fs       |   4 +
 .../SynPatOrContainsTheRangeOfTheBar.fs.bsl   |  58 ++
 ...atRecordContainsTheRangeOfTheEqualsSign.fs |   3 +
 ...cordContainsTheRangeOfTheEqualsSign.fs.bsl |  57 ++
 ...ShouldContainsTheRangeOfTheWithKeyword.fsi |   4 +
 ...ldContainsTheRangeOfTheWithKeyword.fsi.bsl |  63 ++
 ...ithEnumContainsTheRangeOfTheEqualsSign.fsi |   5 +
 ...numContainsTheRangeOfTheEqualsSign.fsi.bsl |  59 ++
 ...elClassContainsTheRangeOfTheEqualsSign.fsi |   5 +
 ...assContainsTheRangeOfTheEqualsSign.fsi.bsl |  35 +
 ...elegateContainsTheRangeOfTheEqualsSign.fsi |   3 +
 ...ateContainsTheRangeOfTheEqualsSign.fsi.bsl |  71 ++
 ...thUnionContainsTheRangeOfTheEqualsSign.fsi |   5 +
 ...ionContainsTheRangeOfTheEqualsSign.fsi.bsl |  78 ++
 ...actSlotContainsTheRangeOfTheWithKeyword.fs |   2 +
 ...lotContainsTheRangeOfTheWithKeyword.fs.bsl |  84 ++
 ...tributeContainsTheRangeOfTheTypeKeyword.fs |   3 +
 ...uteContainsTheRangeOfTheTypeKeyword.fs.bsl |  50 ++
 ...ntationContainsTheRangeOfTheWithKeyword.fs |   2 +
 ...ionContainsTheRangeOfTheWithKeyword.fs.bsl |  68 ++
 ...PropertyContainsTheRangeOfTheEqualsSign.fs |   4 +
 ...ertyContainsTheRangeOfTheEqualsSign.fs.bsl | 107 +++
 ...ropertyContainsTheRangeOfTheWithKeyword.fs |   3 +
 ...rtyContainsTheRangeOfTheWithKeyword.fs.bsl | 111 +++
 ...WithEnumContainsTheRangeOfTheEqualsSign.fs |   3 +
 ...EnumContainsTheRangeOfTheEqualsSign.fs.bsl |  58 ++
 ...nTypeDefnWithMemberWithGetHasXmlComment.fs |   3 +
 ...eDefnWithMemberWithGetHasXmlComment.fs.bsl |  84 ++
 .../SynTypeDefnWithMemberWithSetget.fs        |   2 +
 .../SynTypeDefnWithMemberWithSetget.fs.bsl    | 171 ++++
 ...delClassContainsTheRangeOfTheEqualsSign.fs |   3 +
 ...lassContainsTheRangeOfTheEqualsSign.fs.bsl |  53 ++
 ...DelegateContainsTheRangeOfTheEqualsSign.fs |   1 +
 ...gateContainsTheRangeOfTheEqualsSign.fs.bsl |  71 ++
 ...hRecordContainsTheRangeOfTheWithKeyword.fs |   4 +
 ...ordContainsTheRangeOfTheWithKeyword.fs.bsl | 107 +++
 .../SynTypeDefnWithStaticMemberWithGetset.fs  |   4 +
 ...nTypeDefnWithStaticMemberWithGetset.fs.bsl | 162 ++++
 ...ithUnionContainsTheRangeOfTheEqualsSign.fs |   3 +
 ...nionContainsTheRangeOfTheEqualsSign.fs.bsl |  77 ++
 ...hXmlDocContainsTheRangeOfTheTypeKeyword.fs |   4 +
 ...DocContainsTheRangeOfTheTypeKeyword.fs.bsl |  58 ++
 .../SyntaxTree/SynTypeFunHasRangeOfArrow.fs   |   2 +
 .../SynTypeFunHasRangeOfArrow.fs.bsl          |  35 +
 .../SynTypeOrInsideSynExprTraitCall.fs        |   1 +
 .../SynTypeOrInsideSynExprTraitCall.fs.bsl    | 120 +++
 ...nTypeConstraintWhereTyparSupportsMember.fs |   2 +
 ...eConstraintWhereTyparSupportsMember.fs.bsl | 115 +++
 .../SynTypeOrWithAppTypeOnTheRightHandSide.fs |   1 +
 ...TypeOrWithAppTypeOnTheRightHandSide.fs.bsl |  94 +++
 ...eDoesIncludeLeadingParameterAttributes.fsi |   2 +
 ...sIncludeLeadingParameterAttributes.fsi.bsl | 136 ++++
 ...peTupleDoesIncludeLeadingParameterName.fsi |   2 +
 ...pleDoesIncludeLeadingParameterName.fsi.bsl |  77 ++
 ...nTypeTupleInMeasureTypeWithLeadingSlash.fs |   1 +
 ...eTupleInMeasureTypeWithLeadingSlash.fs.bsl |  52 ++
 .../SynTypeTupleInMeasureTypeWithNoSlashes.fs |   1 +
 ...TypeTupleInMeasureTypeWithNoSlashes.fs.bsl |  52 ++
 ...TypeTupleInMeasureTypeWithStartAndSlash.fs |   1 +
 ...TupleInMeasureTypeWithStartAndSlash.fs.bsl |  55 ++
 .../SynTypeTupleWithStruct,Recovery.fs        |   1 +
 .../SynTypeTupleWithStruct,Recovery.fs.bsl    |  52 ++
 .../data/SyntaxTree/SynTypeTupleWithStruct.fs |   1 +
 .../SyntaxTree/SynTypeTupleWithStruct.fs.bsl  |  46 ++
 .../SyntaxTree/SynUnionCaseKindFullType.fs    |   2 +
 .../SynUnionCaseKindFullType.fs.bsl           |  50 ++
 .../SynValSigContainsParameterNames.fsi       |   5 +
 .../SynValSigContainsParameterNames.fsi.bsl   |  88 ++
 .../data/SyntaxTree/SyntheticKeyword.fs       |   2 +
 .../data/SyntaxTree/SyntheticKeyword.fs.bsl   |  30 +
 ...uoteStringAsParsedHashDirectiveArgument.fs |   1 +
 ...StringAsParsedHashDirectiveArgument.fs.bsl |  16 +
 ...uldBeCaptured,IfUsedInAnInvalidLocation.fs |   8 +
 ...eCaptured,IfUsedInAnInvalidLocation.fs.bsl |  71 ++
 .../TripleSlashCommentShouldNotBeCaptured.fs  |   2 +
 ...ipleSlashCommentShouldNotBeCaptured.fs.bsl |  35 +
 .../TriviaIsPresentInSynTypeDefnSig.fsi       |  14 +
 .../TriviaIsPresentInSynTypeDefnSig.fsi.bsl   | 132 +++
 .../SyntaxTree/TupleInLambdaHasArrowRange.fs  |   1 +
 .../TupleInLambdaHasArrowRange.fs.bsl         |  64 ++
 ...leReturnTypeOfBindingShouldContainStars.fs |   2 +
 ...turnTypeOfBindingShouldContainStars.fs.bsl | 131 +++
 .../UnionCaseFieldsCanHaveComments.fs         |   7 +
 .../UnionCaseFieldsCanHaveComments.fs.bsl     |  55 ++
 tests/service/data/SyntaxTree/UseKeyword.fs   |   3 +
 .../service/data/SyntaxTree/UseKeyword.fs.bsl |  34 +
 .../service/data/SyntaxTree/UseRecKeyword.fs  |   3 +
 .../data/SyntaxTree/UseRecKeyword.fs.bsl      |  37 +
 tests/service/data/SyntaxTree/ValKeyword.fsi  |   4 +
 .../data/SyntaxTree/ValKeyword.fsi.bsl        |  31 +
 .../ValKeywordIsPresentInSynValSig.fsi        |   5 +
 .../ValKeywordIsPresentInSynValSig.fsi.bsl    |  38 +
 ...atimStringAsParsedHashDirectiveArgument.fs |   1 +
 ...StringAsParsedHashDirectiveArgument.fs.bsl |  16 +
 ...nMemberContainsTheRangeOfTheWithKeyword.fs |   3 +
 ...berContainsTheRangeOfTheWithKeyword.fs.bsl | 112 +++
 tests/service/data/SyntaxTree/_LINE_.fs       |   1 +
 tests/service/data/SyntaxTree/_LINE_.fs.bsl   |  13 +
 .../data/SyntaxTree/_SOURCEDIRECTORY_.fs      |   1 +
 .../data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl  |  16 +
 tests/service/data/SyntaxTree/_SOURCEFILE_.fs |   1 +
 .../data/SyntaxTree/_SOURCEFILE_.fs.bsl       |  15 +
 559 files changed, 19143 insertions(+), 8 deletions(-)
 create mode 100644 tests/service/SyntaxTreeTests.fs
 create mode 100644 tests/service/data/SyntaxTree/AbstractKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/AbstractKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/AbstractMemberKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/AbstractMemberKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ActivePatternAsFunction.fs
 create mode 100644 tests/service/data/SyntaxTree/ActivePatternAsFunction.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ActivePatternDefinition.fs
 create mode 100644 tests/service/data/SyntaxTree/ActivePatternDefinition.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs
 create mode 100644 tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/AndKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/AndKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs
 create mode 100644 tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi
 create mode 100644 tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs
 create mode 100644 tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs
 create mode 100644 tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs
 create mode 100644 tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi
 create mode 100644 tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/CommentAfterSourceCode.fs
 create mode 100644 tests/service/data/SyntaxTree/CommentAfterSourceCode.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/CommentAtEndOfFile.fs
 create mode 100644 tests/service/data/SyntaxTree/CommentAtEndOfFile.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs
 create mode 100644 tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi
 create mode 100644 tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/CommentOnSingleLine.fs
 create mode 100644 tests/service/data/SyntaxTree/CommentOnSingleLine.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs
 create mode 100644 tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
 create mode 100644 tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/CustomOperatorDefinition.fs
 create mode 100644 tests/service/data/SyntaxTree/CustomOperatorDefinition.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs
 create mode 100644 tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/DefaultKeyword.fsi
 create mode 100644 tests/service/data/SyntaxTree/DefaultKeyword.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/DefaultValKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/DefaultValKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs
 create mode 100644 tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs
 create mode 100644 tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi
 create mode 100644 tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs
 create mode 100644 tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi
 create mode 100644 tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs
 create mode 100644 tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/DoKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/DoKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/DoStaticKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/DoStaticKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs
 create mode 100644 tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi
 create mode 100644 tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi
 create mode 100644 tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/ExternKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/ExternKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs
 create mode 100644 tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs
 create mode 100644 tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs
 create mode 100644 tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi
 create mode 100644 tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs
 create mode 100644 tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs
 create mode 100644 tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/InHeadPattern.fs
 create mode 100644 tests/service/data/SyntaxTree/InHeadPattern.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/IncompleteLongIdent.fs
 create mode 100644 tests/service/data/SyntaxTree/IncompleteLongIdent.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/InfixOperation.fs
 create mode 100644 tests/service/data/SyntaxTree/InfixOperation.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
 create mode 100644 tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/InlineKeyword.fsi
 create mode 100644 tests/service/data/SyntaxTree/InlineKeyword.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/InlineKeywordInBinding.fs
 create mode 100644 tests/service/data/SyntaxTree/InlineKeywordInBinding.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs
 create mode 100644 tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs
 create mode 100644 tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs
 create mode 100644 tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs
 create mode 100644 tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/LetKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/LetKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/LetRecKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/LetRecKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs
 create mode 100644 tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/MemberKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/MemberKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi
 create mode 100644 tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/MemberValKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/MemberValKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs
 create mode 100644 tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi
 create mode 100644 tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi
 create mode 100644 tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs
 create mode 100644 tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs
 create mode 100644 tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs
 create mode 100644 tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs
 create mode 100644 tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs
 create mode 100644 tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NamedParameter.fs
 create mode 100644 tests/service/data/SyntaxTree/NamedParameter.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs
 create mode 100644 tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NameofOperator.fs
 create mode 100644 tests/service/data/SyntaxTree/NameofOperator.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi
 create mode 100644 tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs
 create mode 100644 tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs
 create mode 100644 tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs
 create mode 100644 tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi
 create mode 100644 tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/NestedIfElseEndif.fs
 create mode 100644 tests/service/data/SyntaxTree/NestedIfElseEndif.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi
 create mode 100644 tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs
 create mode 100644 tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs
 create mode 100644 tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi
 create mode 100644 tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/NewKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/NewKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
 create mode 100644 tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs
 create mode 100644 tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/OperatorAsFunction.fs
 create mode 100644 tests/service/data/SyntaxTree/OperatorAsFunction.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/OperatorInMatchPattern.fs
 create mode 100644 tests/service/data/SyntaxTree/OperatorInMatchPattern.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs
 create mode 100644 tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs
 create mode 100644 tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi
 create mode 100644 tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi
 create mode 100644 tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/OptionalExpression.fs
 create mode 100644 tests/service/data/SyntaxTree/OptionalExpression.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/OverrideKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/OverrideKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/OverrideValKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/OverrideValKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs
 create mode 100644 tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs
 create mode 100644 tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs
 create mode 100644 tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs
 create mode 100644 tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/PrefixOperation.fs
 create mode 100644 tests/service/data/SyntaxTree/PrefixOperation.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs
 create mode 100644 tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs
 create mode 100644 tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs
 create mode 100644 tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttribute.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttribute.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi
 create mode 100644 tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs
 create mode 100644 tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi
 create mode 100644 tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi
 create mode 100644 tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi
 create mode 100644 tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs
 create mode 100644 tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi
 create mode 100644 tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SingleIfElseEndif.fs
 create mode 100644 tests/service/data/SyntaxTree/SingleIfElseEndif.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi
 create mode 100644 tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SingleIfEndif.fs
 create mode 100644 tests/service/data/SyntaxTree/SingleIfEndif.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs
 create mode 100644 tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs
 create mode 100644 tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs
 create mode 100644 tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs
 create mode 100644 tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs
 create mode 100644 tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs
 create mode 100644 tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs
 create mode 100644 tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/StaticAbstractKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/StaticAbstractKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/StaticLetKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/StaticLetKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/StaticLetRecKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/StaticLetRecKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/StaticMemberKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/StaticMemberKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/StaticMemberValKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/StaticMemberValKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/StaticValKeyword.fsi
 create mode 100644 tests/service/data/SyntaxTree/StaticValKeyword.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs
 create mode 100644 tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs
 create mode 100644 tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs
 create mode 100644 tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs
 create mode 100644 tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs
 create mode 100644 tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs
 create mode 100644 tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi
 create mode 100644 tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprObjWithSetter.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprObjWithSetter.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs
 create mode 100644 tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi
 create mode 100644 tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs
 create mode 100644 tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs
 create mode 100644 tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs
 create mode 100644 tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs
 create mode 100644 tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi
 create mode 100644 tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/SyntheticKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/SyntheticKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs
 create mode 100644 tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs
 create mode 100644 tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs
 create mode 100644 tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi
 create mode 100644 tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs
 create mode 100644 tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs
 create mode 100644 tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs
 create mode 100644 tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/UseKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/UseKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/UseRecKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/UseRecKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/ValKeyword.fsi
 create mode 100644 tests/service/data/SyntaxTree/ValKeyword.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi
 create mode 100644 tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi.bsl
 create mode 100644 tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs
 create mode 100644 tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
 create mode 100644 tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/_LINE_.fs
 create mode 100644 tests/service/data/SyntaxTree/_LINE_.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs
 create mode 100644 tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl
 create mode 100644 tests/service/data/SyntaxTree/_SOURCEFILE_.fs
 create mode 100644 tests/service/data/SyntaxTree/_SOURCEFILE_.fs.bsl

diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
index 0c1d3cf9273..1876c8e247a 100644
--- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
+++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
@@ -42,6 +42,7 @@
     <Compile Include="TestDoubles.fs" />
     <Compile Include="ConsoleOnlyOptionsTests.fs" />
     <Compile Include="VisualStudioVersusConsoleContextTests.fs" />
+    <Compile Include="..\service\SyntaxTreeTests.fs" />
     <Compile Include="..\service\SyntaxTreeTests\TypeTests.fs">
       <Link>SyntaxTree\TypeTests.fs</Link>
     </Compile>
diff --git a/tests/service/SyntaxTreeTests.fs b/tests/service/SyntaxTreeTests.fs
new file mode 100644
index 00000000000..e0930721811
--- /dev/null
+++ b/tests/service/SyntaxTreeTests.fs
@@ -0,0 +1,66 @@
+module Tests.Service.SyntaxTree
+
+open System.IO
+open FSharp.Compiler.CodeAnalysis
+open FSharp.Compiler.Service.Tests.Common
+open FSharp.Compiler.Text
+open NUnit.Framework
+
+let testCasesDir = Path.Combine(__SOURCE_DIRECTORY__, "data", "SyntaxTree")
+let fsharpFiles = set [| ".fs"; ".fsi"; ".fsx" |]
+
+let allTestCases =
+    Directory.EnumerateFiles(testCasesDir)
+    |> Seq.filter (fun file -> FileInfo(file).Extension |> fsharpFiles.Contains)
+    |> Seq.map (fun f ->
+        let fileName = Path.GetFileName f
+        [| fileName :> obj |])
+    |> Seq.toArray
+
+[<Literal>]
+let RootDirectory = @"/root"
+
+let parseSourceCode (name: string, code: string) =
+    let location = Path.Combine(RootDirectory, name).Replace("\\", "/")
+
+    let parseResults =
+        checker.ParseFile(
+            location,
+            SourceText.ofString code,
+            { FSharpParsingOptions.Default with
+                SourceFiles = [| location |] }
+        )
+        |> Async.RunImmediate
+
+    parseResults.ParseTree
+
+/// Asserts the parsed untyped tree matches the expected baseline.
+///
+/// To update a baseline:
+///     CMD: set TEST_UPDATE_BSL=1 & dotnet test --filter "ParseFile"
+///     PowerShell: $env:TEST_UPDATE_BSL = "1" ; dotnet test --filter "ParseFile"
+///     Linux/macOS: export TEST_UPDATE_BSL=1 & dotnet test --filter "ParseFile"
+///
+/// Assuming your current directory is tests/FSharp.Compiler.Service.Tests
+[<TestCaseSource(nameof allTestCases)>]
+let ParseFile fileName =
+    let fullPath = Path.Combine(testCasesDir, fileName)
+    let contents = File.ReadAllText fullPath
+    let ast = parseSourceCode (fileName, contents)
+
+    let normalize (s: string) = s.Replace("\r", "")
+    let actual = sprintf "%A" ast |> normalize
+    let bslPath = $"{fullPath}.bsl"
+
+    let expected =
+        if File.Exists bslPath then
+            File.ReadAllText bslPath |> normalize
+        else
+            "No baseline was found"
+
+    let testUpdateBSLEnv = System.Environment.GetEnvironmentVariable("TEST_UPDATE_BSL")
+
+    if not (isNull testUpdateBSLEnv) && testUpdateBSLEnv.Trim() = "1" then
+        File.WriteAllText(bslPath, actual)
+
+    Assert.AreEqual(expected, actual)
diff --git a/tests/service/SyntaxTreeTests/SynIdentTests.fs b/tests/service/SyntaxTreeTests/SynIdentTests.fs
index aa16871a609..500e3e76ed4 100644
--- a/tests/service/SyntaxTreeTests/SynIdentTests.fs
+++ b/tests/service/SyntaxTreeTests/SynIdentTests.fs
@@ -21,11 +21,11 @@ A.
         Assert.AreEqual(1, lid.IdentsWithTrivia.Length)
     | _ -> Assert.Fail $"Could not get valid AST, got {ast}"
 
-[<Test>]
-let ``IdentsWithTrivia with unbalance collection should not throw`` () =
-    let synLongIdent =
-        SynLongIdent([ Ident("A", Range.Zero); Ident("B", Range.Zero) ], [ Range.Zero ], [ None ])
-
-    match synLongIdent.IdentsWithTrivia with
-    | [ SynIdent (_, None); SynIdent (_, None) ] -> Assert.Pass()
-    | identsWithTrivia -> Assert.Fail $"Unexpected identsWithTrivia, got {identsWithTrivia}"
+// [<Test>]
+// let ``IdentsWithTrivia with unbalance collection should not throw`` () =
+//     let synLongIdent =
+//         SynLongIdent([ Ident("A", Range.Zero); Ident("B", Range.Zero) ], [ Range.Zero ], [ None ])
+//
+//     match synLongIdent.IdentsWithTrivia with
+//     | [ SynIdent (_, None); SynIdent (_, None) ] -> Assert.Pass()
+//     | identsWithTrivia -> Assert.Fail $"Unexpected identsWithTrivia, got {identsWithTrivia}"
diff --git a/tests/service/data/SyntaxTree/AbstractKeyword.fs b/tests/service/data/SyntaxTree/AbstractKeyword.fs
new file mode 100644
index 00000000000..6135c0cca9b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/AbstractKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    abstract Y : int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AbstractKeyword.fs.bsl b/tests/service/data/SyntaxTree/AbstractKeyword.fs.bsl
new file mode 100644
index 00000000000..64e6c644c6f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/AbstractKeyword.fs.bsl
@@ -0,0 +1,45 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/AbstractKeyword.fs", false, QualifiedNameOfFile AbstractKeyword, [],
+      [],
+      [SynModuleOrNamespace
+         ([AbstractKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/AbstractKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [AbstractSlot
+                        (SynValSig
+                           ([], SynIdent (Y, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None, /root/AbstractKeyword.fs (2,4--2,20),
+                            { LeadingKeyword =
+                               Abstract /root/AbstractKeyword.fs (2,4--2,12)
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/AbstractKeyword.fs (2,4--2,20),
+                         { GetSetKeywords = None })],
+                     /root/AbstractKeyword.fs (2,4--2,20)), [], None,
+                  /root/AbstractKeyword.fs (1,5--2,20),
+                  { LeadingKeyword = Type /root/AbstractKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/AbstractKeyword.fs (1,7--1,8)
+                    WithKeyword = None })], /root/AbstractKeyword.fs (1,0--2,20))],
+          PreXmlDocEmpty, [], None, /root/AbstractKeyword.fs (1,0--2,20),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs b/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs
new file mode 100644
index 00000000000..2528e96f13b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    abstract member Y : int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs.bsl
new file mode 100644
index 00000000000..3e40c51337c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs.bsl
@@ -0,0 +1,50 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/AbstractMemberKeyword.fs", false,
+      QualifiedNameOfFile AbstractMemberKeyword, [], [],
+      [SynModuleOrNamespace
+         ([AbstractMemberKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/AbstractMemberKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [AbstractSlot
+                        (SynValSig
+                           ([], SynIdent (Y, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/AbstractMemberKeyword.fs (2,4--2,27),
+                            { LeadingKeyword =
+                               AbstractMember
+                                 (/root/AbstractMemberKeyword.fs (2,4--2,12),
+                                  /root/AbstractMemberKeyword.fs (2,13--2,19))
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/AbstractMemberKeyword.fs (2,4--2,27),
+                         { GetSetKeywords = None })],
+                     /root/AbstractMemberKeyword.fs (2,4--2,27)), [], None,
+                  /root/AbstractMemberKeyword.fs (1,5--2,27),
+                  { LeadingKeyword =
+                     Type /root/AbstractMemberKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/AbstractMemberKeyword.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/AbstractMemberKeyword.fs (1,0--2,27))], PreXmlDocEmpty, [],
+          None, /root/AbstractMemberKeyword.fs (1,0--2,27),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs b/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs
new file mode 100644
index 00000000000..3e220f24f32
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs
@@ -0,0 +1 @@
+(|Odd|Even|) 4
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs.bsl
new file mode 100644
index 00000000000..2bd45e53344
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs.bsl
@@ -0,0 +1,25 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ActivePatternAsFunction.fs", false,
+      QualifiedNameOfFile ActivePatternAsFunction, [], [],
+      [SynModuleOrNamespace
+         ([ActivePatternAsFunction], false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false,
+                 LongIdent
+                   (false,
+                    SynLongIdent
+                      ([|Odd|Even|], [],
+                       [Some
+                          (HasParenthesis
+                             (/root/ActivePatternAsFunction.fs (1,0--1,1),
+                              /root/ActivePatternAsFunction.fs (1,11--1,12)))]),
+                    None, /root/ActivePatternAsFunction.fs (1,0--1,12)),
+                 Const (Int32 4, /root/ActivePatternAsFunction.fs (1,13--1,14)),
+                 /root/ActivePatternAsFunction.fs (1,0--1,14)),
+              /root/ActivePatternAsFunction.fs (1,0--1,14))], PreXmlDocEmpty, [],
+          None, /root/ActivePatternAsFunction.fs (1,0--1,14),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ActivePatternDefinition.fs b/tests/service/data/SyntaxTree/ActivePatternDefinition.fs
new file mode 100644
index 00000000000..9f148ee7984
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ActivePatternDefinition.fs
@@ -0,0 +1 @@
+let (|Odd|Even|) (a: int) = if a % 2 = 0 then Even else Odd
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/ActivePatternDefinition.fs.bsl
new file mode 100644
index 00000000000..4aff71b0616
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ActivePatternDefinition.fs.bsl
@@ -0,0 +1,88 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ActivePatternDefinition.fs", false,
+      QualifiedNameOfFile ActivePatternDefinition, [], [],
+      [SynModuleOrNamespace
+         ([ActivePatternDefinition], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some a)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent
+                       ([|Odd|Even|], [],
+                        [Some
+                           (HasParenthesis
+                              (/root/ActivePatternDefinition.fs (1,4--1,5),
+                               /root/ActivePatternDefinition.fs (1,15--1,16)))]),
+                     None, None,
+                     Pats
+                       [Paren
+                          (Typed
+                             (Named
+                                (SynIdent (a, None), false, None,
+                                 /root/ActivePatternDefinition.fs (1,18--1,19)),
+                              LongIdent (SynLongIdent ([int], [], [None])),
+                              /root/ActivePatternDefinition.fs (1,18--1,24)),
+                           /root/ActivePatternDefinition.fs (1,17--1,25))], None,
+                     /root/ActivePatternDefinition.fs (1,4--1,25)), None,
+                  IfThenElse
+                    (App
+                       (NonAtomic, false,
+                        App
+                          (NonAtomic, true,
+                           LongIdent
+                             (false,
+                              SynLongIdent
+                                ([op_Equality], [],
+                                 [Some (OriginalNotation "=")]), None,
+                              /root/ActivePatternDefinition.fs (1,37--1,38)),
+                           App
+                             (NonAtomic, false,
+                              App
+                                (NonAtomic, true,
+                                 LongIdent
+                                   (false,
+                                    SynLongIdent
+                                      ([op_Modulus], [],
+                                       [Some (OriginalNotation "%")]), None,
+                                    /root/ActivePatternDefinition.fs (1,33--1,34)),
+                                 Ident a,
+                                 /root/ActivePatternDefinition.fs (1,31--1,34)),
+                              Const
+                                (Int32 2,
+                                 /root/ActivePatternDefinition.fs (1,35--1,36)),
+                              /root/ActivePatternDefinition.fs (1,31--1,36)),
+                           /root/ActivePatternDefinition.fs (1,31--1,38)),
+                        Const
+                          (Int32 0,
+                           /root/ActivePatternDefinition.fs (1,39--1,40)),
+                        /root/ActivePatternDefinition.fs (1,31--1,40)),
+                     Ident Even, Some (Ident Odd),
+                     Yes /root/ActivePatternDefinition.fs (1,28--1,45), false,
+                     /root/ActivePatternDefinition.fs (1,28--1,59),
+                     { IfKeyword = /root/ActivePatternDefinition.fs (1,28--1,30)
+                       IsElif = false
+                       ThenKeyword =
+                        /root/ActivePatternDefinition.fs (1,41--1,45)
+                       ElseKeyword =
+                        Some /root/ActivePatternDefinition.fs (1,51--1,55)
+                       IfToThenRange =
+                        /root/ActivePatternDefinition.fs (1,28--1,45) }),
+                  /root/ActivePatternDefinition.fs (1,4--1,25), NoneAtLet,
+                  { LeadingKeyword =
+                     Let /root/ActivePatternDefinition.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some /root/ActivePatternDefinition.fs (1,26--1,27) })],
+              /root/ActivePatternDefinition.fs (1,0--1,59))], PreXmlDocEmpty, [],
+          None, /root/ActivePatternDefinition.fs (1,0--1,59),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs b/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs
new file mode 100644
index 00000000000..33c0852dc2e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs
@@ -0,0 +1,6 @@
+type A() =
+    member private _.(|
+        A'
+    |) = (|
+        Lazy
+    |)
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs.bsl b/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs.bsl
new file mode 100644
index 00000000000..63061cd5dc3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs.bsl
@@ -0,0 +1,99 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ActivePatternIdentifierInPrivateMember.fs", false,
+      QualifiedNameOfFile ActivePatternIdentifierInPrivateMember, [], [],
+      [SynModuleOrNamespace
+         ([ActivePatternIdentifierInPrivateMember], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [A],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/ActivePatternIdentifierInPrivateMember.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/ActivePatternIdentifierInPrivateMember.fs (1,6--1,8)),
+                         None,
+                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/ActivePatternIdentifierInPrivateMember.fs (1,5--1,6),
+                         { AsKeyword = None });
+                      Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([_; |A'|],
+                                  [/root/ActivePatternIdentifierInPrivateMember.fs (2,20--2,21)],
+                                  [None;
+                                   Some
+                                     (HasParenthesis
+                                        (/root/ActivePatternIdentifierInPrivateMember.fs (2,21--2,22),
+                                         /root/ActivePatternIdentifierInPrivateMember.fs (4,5--4,6)))]),
+                               None, None, Pats [],
+                               Some
+                                 (Private
+                                    /root/ActivePatternIdentifierInPrivateMember.fs (2,11--2,18)),
+                               /root/ActivePatternIdentifierInPrivateMember.fs (2,11--4,6)),
+                            None,
+                            LongIdent
+                              (false,
+                               SynLongIdent
+                                 ([|Lazy|], [],
+                                  [Some
+                                     (HasParenthesis
+                                        (/root/ActivePatternIdentifierInPrivateMember.fs (4,9--4,10),
+                                         /root/ActivePatternIdentifierInPrivateMember.fs (6,5--6,6)))]),
+                               None,
+                               /root/ActivePatternIdentifierInPrivateMember.fs (4,9--6,6)),
+                            /root/ActivePatternIdentifierInPrivateMember.fs (2,11--4,6),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Member
+                                 /root/ActivePatternIdentifierInPrivateMember.fs (2,4--2,10)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/ActivePatternIdentifierInPrivateMember.fs (4,7--4,8) }),
+                         /root/ActivePatternIdentifierInPrivateMember.fs (2,4--6,6))],
+                     /root/ActivePatternIdentifierInPrivateMember.fs (2,4--6,6)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/ActivePatternIdentifierInPrivateMember.fs (1,6--1,8)),
+                        None,
+                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/ActivePatternIdentifierInPrivateMember.fs (1,5--1,6),
+                        { AsKeyword = None })),
+                  /root/ActivePatternIdentifierInPrivateMember.fs (1,5--6,6),
+                  { LeadingKeyword =
+                     Type
+                       /root/ActivePatternIdentifierInPrivateMember.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/ActivePatternIdentifierInPrivateMember.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/ActivePatternIdentifierInPrivateMember.fs (1,0--6,6))],
+          PreXmlDocEmpty, [], None,
+          /root/ActivePatternIdentifierInPrivateMember.fs (1,0--6,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AndKeyword.fs b/tests/service/data/SyntaxTree/AndKeyword.fs
new file mode 100644
index 00000000000..b7659775be8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/AndKeyword.fs
@@ -0,0 +1,2 @@
+let rec a b = b + 1
+and d e = e + 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AndKeyword.fs.bsl b/tests/service/data/SyntaxTree/AndKeyword.fs.bsl
new file mode 100644
index 00000000000..bcad0af343b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/AndKeyword.fs.bsl
@@ -0,0 +1,76 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/AndKeyword.fs", false, QualifiedNameOfFile AndKeyword, [], [],
+      [SynModuleOrNamespace
+         ([AndKeyword], false, AnonModule,
+          [Let
+             (true,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some b)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([a], [], [None]), None, None,
+                     Pats
+                       [Named
+                          (SynIdent (b, None), false, None,
+                           /root/AndKeyword.fs (1,10--1,11))], None,
+                     /root/AndKeyword.fs (1,8--1,11)), None,
+                  App
+                    (NonAtomic, false,
+                     App
+                       (NonAtomic, true,
+                        LongIdent
+                          (false,
+                           SynLongIdent
+                             ([op_Addition], [], [Some (OriginalNotation "+")]),
+                           None, /root/AndKeyword.fs (1,16--1,17)), Ident b,
+                        /root/AndKeyword.fs (1,14--1,17)),
+                     Const (Int32 1, /root/AndKeyword.fs (1,18--1,19)),
+                     /root/AndKeyword.fs (1,14--1,19)),
+                  /root/AndKeyword.fs (1,8--1,11), NoneAtLet,
+                  { LeadingKeyword =
+                     LetRec
+                       (/root/AndKeyword.fs (1,0--1,3),
+                        /root/AndKeyword.fs (1,4--1,7))
+                    InlineKeyword = None
+                    EqualsRange = Some /root/AndKeyword.fs (1,12--1,13) });
+               SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some e)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([d], [], [None]), None, None,
+                     Pats
+                       [Named
+                          (SynIdent (e, None), false, None,
+                           /root/AndKeyword.fs (2,6--2,7))], None,
+                     /root/AndKeyword.fs (2,4--2,7)), None,
+                  App
+                    (NonAtomic, false,
+                     App
+                       (NonAtomic, true,
+                        LongIdent
+                          (false,
+                           SynLongIdent
+                             ([op_Addition], [], [Some (OriginalNotation "+")]),
+                           None, /root/AndKeyword.fs (2,12--2,13)), Ident e,
+                        /root/AndKeyword.fs (2,10--2,13)),
+                     Const (Int32 1, /root/AndKeyword.fs (2,14--2,15)),
+                     /root/AndKeyword.fs (2,10--2,15)),
+                  /root/AndKeyword.fs (2,4--2,7), NoneAtLet,
+                  { LeadingKeyword = And /root/AndKeyword.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange = Some /root/AndKeyword.fs (2,8--2,9) })],
+              /root/AndKeyword.fs (1,0--2,15))], PreXmlDocEmpty, [], None,
+          /root/AndKeyword.fs (1,0--2,15), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs b/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs
new file mode 100644
index 00000000000..eb103ad8ab1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs
@@ -0,0 +1,2 @@
+type X =
+    abstract member Y: [<Foo; Bar>] ?a: A -> B
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs.bsl b/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs.bsl
new file mode 100644
index 00000000000..73fc19424e0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs.bsl
@@ -0,0 +1,112 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/AttributesInOptionalNamedMemberParameter.fs", false,
+      QualifiedNameOfFile AttributesInOptionalNamedMemberParameter, [], [],
+      [SynModuleOrNamespace
+         ([AttributesInOptionalNamedMemberParameter], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/AttributesInOptionalNamedMemberParameter.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [AbstractSlot
+                        (SynValSig
+                           ([], SynIdent (Y, None),
+                            SynValTyparDecls (None, true),
+                            Fun
+                              (SignatureParameter
+                                 ([{ Attributes =
+                                      [{ TypeName =
+                                          SynLongIdent ([Foo], [], [None])
+                                         ArgExpr =
+                                          Const
+                                            (Unit,
+                                             /root/AttributesInOptionalNamedMemberParameter.fs (2,25--2,28))
+                                         Target = None
+                                         AppliesToGetterAndSetter = false
+                                         Range =
+                                          /root/AttributesInOptionalNamedMemberParameter.fs (2,25--2,28) };
+                                       { TypeName =
+                                          SynLongIdent ([Bar], [], [None])
+                                         ArgExpr =
+                                          Const
+                                            (Unit,
+                                             /root/AttributesInOptionalNamedMemberParameter.fs (2,30--2,33))
+                                         Target = None
+                                         AppliesToGetterAndSetter = false
+                                         Range =
+                                          /root/AttributesInOptionalNamedMemberParameter.fs (2,30--2,33) }]
+                                     Range =
+                                      /root/AttributesInOptionalNamedMemberParameter.fs (2,23--2,35) }],
+                                  true, Some a,
+                                  LongIdent (SynLongIdent ([A], [], [None])),
+                                  /root/AttributesInOptionalNamedMemberParameter.fs (2,23--2,41)),
+                               LongIdent (SynLongIdent ([B], [], [None])),
+                               /root/AttributesInOptionalNamedMemberParameter.fs (2,23--2,46),
+                               { ArrowRange =
+                                  /root/AttributesInOptionalNamedMemberParameter.fs (2,42--2,44) }),
+                            SynValInfo
+                              ([[SynArgInfo
+                                   ([{ Attributes =
+                                        [{ TypeName =
+                                            SynLongIdent ([Foo], [], [None])
+                                           ArgExpr =
+                                            Const
+                                              (Unit,
+                                               /root/AttributesInOptionalNamedMemberParameter.fs (2,25--2,28))
+                                           Target = None
+                                           AppliesToGetterAndSetter = false
+                                           Range =
+                                            /root/AttributesInOptionalNamedMemberParameter.fs (2,25--2,28) };
+                                         { TypeName =
+                                            SynLongIdent ([Bar], [], [None])
+                                           ArgExpr =
+                                            Const
+                                              (Unit,
+                                               /root/AttributesInOptionalNamedMemberParameter.fs (2,30--2,33))
+                                           Target = None
+                                           AppliesToGetterAndSetter = false
+                                           Range =
+                                            /root/AttributesInOptionalNamedMemberParameter.fs (2,30--2,33) }]
+                                       Range =
+                                        /root/AttributesInOptionalNamedMemberParameter.fs (2,23--2,35) }],
+                                    true, Some a)]],
+                               SynArgInfo ([], false, None)), false, false,
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/AttributesInOptionalNamedMemberParameter.fs (2,4--2,46),
+                            { LeadingKeyword =
+                               AbstractMember
+                                 (/root/AttributesInOptionalNamedMemberParameter.fs (2,4--2,12),
+                                  /root/AttributesInOptionalNamedMemberParameter.fs (2,13--2,19))
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = Member },
+                         /root/AttributesInOptionalNamedMemberParameter.fs (2,4--2,46),
+                         { GetSetKeywords = None })],
+                     /root/AttributesInOptionalNamedMemberParameter.fs (2,4--2,46)),
+                  [], None,
+                  /root/AttributesInOptionalNamedMemberParameter.fs (1,5--2,46),
+                  { LeadingKeyword =
+                     Type
+                       /root/AttributesInOptionalNamedMemberParameter.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/AttributesInOptionalNamedMemberParameter.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/AttributesInOptionalNamedMemberParameter.fs (1,0--2,46))],
+          PreXmlDocEmpty, [], None,
+          /root/AttributesInOptionalNamedMemberParameter.fs (1,0--2,46),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi b/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi
new file mode 100644
index 00000000000..4b1761ae383
--- /dev/null
+++ b/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi
@@ -0,0 +1,3 @@
+namespace Meh
+
+val a (* b *) : int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi.bsl
new file mode 100644
index 00000000000..3a7a41f6c09
--- /dev/null
+++ b/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi.bsl
@@ -0,0 +1,31 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/BlockCommentInSourceCode,SignatureFile.fsi",
+      QualifiedNameOfFile BlockCommentInSourceCode,SignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (a, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None,
+                 /root/BlockCommentInSourceCode,SignatureFile.fsi (3,0--3,19),
+                 { LeadingKeyword =
+                    Val
+                      /root/BlockCommentInSourceCode,SignatureFile.fsi (3,0--3,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange = None }),
+              /root/BlockCommentInSourceCode,SignatureFile.fsi (3,0--3,19))],
+          PreXmlDocEmpty, [], None,
+          /root/BlockCommentInSourceCode,SignatureFile.fsi (1,0--3,19),
+          { LeadingKeyword =
+             Namespace
+               /root/BlockCommentInSourceCode,SignatureFile.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [BlockComment
+            /root/BlockCommentInSourceCode,SignatureFile.fsi (3,6--3,13)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs b/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs
new file mode 100644
index 00000000000..9919d73b770
--- /dev/null
+++ b/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs
@@ -0,0 +1 @@
+let a (* b *)  c = c + 42
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs.bsl b/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs.bsl
new file mode 100644
index 00000000000..634e92dcbb1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs.bsl
@@ -0,0 +1,48 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/BlockCommentInSourceCode.fs", false,
+      QualifiedNameOfFile BlockCommentInSourceCode, [], [],
+      [SynModuleOrNamespace
+         ([BlockCommentInSourceCode], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some c)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([a], [], [None]), None, None,
+                     Pats
+                       [Named
+                          (SynIdent (c, None), false, None,
+                           /root/BlockCommentInSourceCode.fs (1,15--1,16))],
+                     None, /root/BlockCommentInSourceCode.fs (1,4--1,16)), None,
+                  App
+                    (NonAtomic, false,
+                     App
+                       (NonAtomic, true,
+                        LongIdent
+                          (false,
+                           SynLongIdent
+                             ([op_Addition], [], [Some (OriginalNotation "+")]),
+                           None, /root/BlockCommentInSourceCode.fs (1,21--1,22)),
+                        Ident c, /root/BlockCommentInSourceCode.fs (1,19--1,22)),
+                     Const
+                       (Int32 42, /root/BlockCommentInSourceCode.fs (1,23--1,25)),
+                     /root/BlockCommentInSourceCode.fs (1,19--1,25)),
+                  /root/BlockCommentInSourceCode.fs (1,4--1,16), NoneAtLet,
+                  { LeadingKeyword =
+                     Let /root/BlockCommentInSourceCode.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some /root/BlockCommentInSourceCode.fs (1,17--1,18) })],
+              /root/BlockCommentInSourceCode.fs (1,0--1,25))], PreXmlDocEmpty,
+          [], None, /root/BlockCommentInSourceCode.fs (1,0--1,25),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [BlockComment /root/BlockCommentInSourceCode.fs (1,6--1,13)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs
new file mode 100644
index 00000000000..1dc8211b83b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs
@@ -0,0 +1 @@
+let x y : int = failwith "todo"
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
new file mode 100644
index 00000000000..bb2963283e0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
@@ -0,0 +1,57 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ColonBeforeReturnTypeIsPartOfTrivia.fs", false,
+      QualifiedNameOfFile ColonBeforeReturnTypeIsPartOfTrivia, [], [],
+      [SynModuleOrNamespace
+         ([ColonBeforeReturnTypeIsPartOfTrivia], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some y)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([x], [], [None]), None, None,
+                     Pats
+                       [Named
+                          (SynIdent (y, None), false, None,
+                           /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,6--1,7))],
+                     None,
+                     /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,4--1,7)),
+                  Some
+                    (SynBindingReturnInfo
+                       (LongIdent (SynLongIdent ([int], [], [None])),
+                        /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,10--1,13),
+                        [],
+                        { ColonRange =
+                           Some
+                             /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,8--1,9) })),
+                  Typed
+                    (App
+                       (NonAtomic, false, Ident failwith,
+                        Const
+                          (String
+                             ("todo", Regular,
+                              /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,25--1,31)),
+                           /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,25--1,31)),
+                        /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,16--1,31)),
+                     LongIdent (SynLongIdent ([int], [], [None])),
+                     /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,16--1,31)),
+                  /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,4--1,7),
+                  NoneAtLet,
+                  { LeadingKeyword =
+                     Let /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,14--1,15) })],
+              /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,0--1,31))],
+          PreXmlDocEmpty, [], None,
+          /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,0--1,31),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs
new file mode 100644
index 00000000000..07ed16ffa00
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs
@@ -0,0 +1,2 @@
+type X =
+    member this.Y with get():int = 1 and set (_:int):unit = ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
new file mode 100644
index 00000000000..7da91f90182
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
@@ -0,0 +1,156 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs", false,
+      QualifiedNameOfFile ColonBeforeReturnTypeIsPartOfTriviaInProperties, [],
+      [],
+      [SynModuleOrNamespace
+         ([ColonBeforeReturnTypeIsPartOfTriviaInProperties], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [GetSetMember
+                        (Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertyGet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)]; []],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([this; Y],
+                                     [/root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,15--2,16)],
+                                     [None; None]), Some get, None,
+                                  Pats
+                                    [Paren
+                                       (Const
+                                          (Unit,
+                                           /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,26--2,28)),
+                                        /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,26--2,28))],
+                                  None,
+                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,23--2,28)),
+                               Some
+                                 (SynBindingReturnInfo
+                                    (LongIdent
+                                       (SynLongIdent ([int], [], [None])),
+                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,29--2,32),
+                                     [],
+                                     { ColonRange =
+                                        Some
+                                          /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,28--2,29) })),
+                               Typed
+                                 (Const
+                                    (Int32 1,
+                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,35--2,36)),
+                                  LongIdent (SynLongIdent ([int], [], [None])),
+                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,35--2,36)),
+                               /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,23--2,28),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,4--2,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,33--2,34) })),
+                         Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertySet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)];
+                                      [SynArgInfo ([], false, None)]],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([this; Y],
+                                     [/root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,15--2,16)],
+                                     [None; None]), Some set, None,
+                                  Pats
+                                    [Paren
+                                       (Typed
+                                          (Wild
+                                             /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,46--2,47),
+                                           LongIdent
+                                             (SynLongIdent ([int], [], [None])),
+                                           /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,46--2,51)),
+                                        /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,45--2,52))],
+                                  None,
+                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,41--2,52)),
+                               Some
+                                 (SynBindingReturnInfo
+                                    (LongIdent
+                                       (SynLongIdent ([unit], [], [None])),
+                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,53--2,57),
+                                     [],
+                                     { ColonRange =
+                                        Some
+                                          /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,52--2,53) })),
+                               Typed
+                                 (Const
+                                    (Unit,
+                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,60--2,62)),
+                                  LongIdent (SynLongIdent ([unit], [], [None])),
+                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,60--2,62)),
+                               /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,41--2,52),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,4--2,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,58--2,59) })),
+                         /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,4--2,62),
+                         { InlineKeyword = None
+                           WithKeyword =
+                            /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,18--2,22)
+                           GetKeyword =
+                            Some
+                              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,23--2,26)
+                           AndKeyword =
+                            Some
+                              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,37--2,40)
+                           SetKeyword =
+                            Some
+                              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,41--2,44) })],
+                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,4--2,62)),
+                  [], None,
+                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (1,5--2,62),
+                  { LeadingKeyword =
+                     Type
+                       /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (1,0--2,62))],
+          PreXmlDocEmpty, [], None,
+          /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (1,0--2,62),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi b/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi
new file mode 100644
index 00000000000..81bdd7846fd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi
@@ -0,0 +1,3 @@
+namespace Meh
+
+val foo : int // comment!
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi.bsl
new file mode 100644
index 00000000000..3f8f30f3075
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi.bsl
@@ -0,0 +1,30 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/CommentAfterSourceCode,SignatureFile.fsi",
+      QualifiedNameOfFile CommentAfterSourceCode,SignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (foo, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None,
+                 /root/CommentAfterSourceCode,SignatureFile.fsi (3,0--3,13),
+                 { LeadingKeyword =
+                    Val
+                      /root/CommentAfterSourceCode,SignatureFile.fsi (3,0--3,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange = None }),
+              /root/CommentAfterSourceCode,SignatureFile.fsi (3,0--3,13))],
+          PreXmlDocEmpty, [], None,
+          /root/CommentAfterSourceCode,SignatureFile.fsi (1,0--3,13),
+          { LeadingKeyword =
+             Namespace /root/CommentAfterSourceCode,SignatureFile.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/CommentAfterSourceCode,SignatureFile.fsi (3,14--3,25)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs b/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs
new file mode 100644
index 00000000000..27f5776aae0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs
@@ -0,0 +1 @@
+foo() // comment!
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs.bsl b/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs.bsl
new file mode 100644
index 00000000000..54f31927c8f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs.bsl
@@ -0,0 +1,17 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/CommentAfterSourceCode.fs", false,
+      QualifiedNameOfFile CommentAfterSourceCode, [], [],
+      [SynModuleOrNamespace
+         ([CommentAfterSourceCode], false, AnonModule,
+          [Expr
+             (App
+                (Atomic, false, Ident foo,
+                 Const (Unit, /root/CommentAfterSourceCode.fs (1,3--1,5)),
+                 /root/CommentAfterSourceCode.fs (1,0--1,5)),
+              /root/CommentAfterSourceCode.fs (1,0--1,5))], PreXmlDocEmpty, [],
+          None, /root/CommentAfterSourceCode.fs (1,0--1,5),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [LineComment /root/CommentAfterSourceCode.fs (1,6--1,17)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs b/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs
new file mode 100644
index 00000000000..1f2e5c84288
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs
@@ -0,0 +1 @@
+x // y
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs.bsl b/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs.bsl
new file mode 100644
index 00000000000..64a08501776
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs.bsl
@@ -0,0 +1,12 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/CommentAtEndOfFile.fs", false,
+      QualifiedNameOfFile CommentAtEndOfFile, [], [],
+      [SynModuleOrNamespace
+         ([CommentAtEndOfFile], false, AnonModule,
+          [Expr (Ident x, /root/CommentAtEndOfFile.fs (1,0--1,1))],
+          PreXmlDocEmpty, [], None, /root/CommentAtEndOfFile.fs (1,0--1,1),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [LineComment /root/CommentAtEndOfFile.fs (1,2--1,6)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs b/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs
new file mode 100644
index 00000000000..cc7bd4175e4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs
@@ -0,0 +1,4 @@
+if a then
+b
+else (* some long comment here *) if c then
+d
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs.bsl b/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs.bsl
new file mode 100644
index 00000000000..e9a00367cc5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs.bsl
@@ -0,0 +1,36 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/CommentBetweenElseAndIf.fs", false,
+      QualifiedNameOfFile CommentBetweenElseAndIf, [], [],
+      [SynModuleOrNamespace
+         ([CommentBetweenElseAndIf], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b,
+                 Some
+                   (IfThenElse
+                      (Ident c, Ident d, None,
+                       Yes /root/CommentBetweenElseAndIf.fs (3,34--3,43), false,
+                       /root/CommentBetweenElseAndIf.fs (3,34--4,1),
+                       { IfKeyword =
+                          /root/CommentBetweenElseAndIf.fs (3,34--3,36)
+                         IsElif = false
+                         ThenKeyword =
+                          /root/CommentBetweenElseAndIf.fs (3,39--3,43)
+                         ElseKeyword = None
+                         IfToThenRange =
+                          /root/CommentBetweenElseAndIf.fs (3,34--3,43) })),
+                 Yes /root/CommentBetweenElseAndIf.fs (1,0--1,9), false,
+                 /root/CommentBetweenElseAndIf.fs (1,0--4,1),
+                 { IfKeyword = /root/CommentBetweenElseAndIf.fs (1,0--1,2)
+                   IsElif = false
+                   ThenKeyword = /root/CommentBetweenElseAndIf.fs (1,5--1,9)
+                   ElseKeyword =
+                    Some /root/CommentBetweenElseAndIf.fs (3,0--3,4)
+                   IfToThenRange = /root/CommentBetweenElseAndIf.fs (1,0--1,9) }),
+              /root/CommentBetweenElseAndIf.fs (1,0--4,1))], PreXmlDocEmpty, [],
+          None, /root/CommentBetweenElseAndIf.fs (1,0--4,1),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [BlockComment /root/CommentBetweenElseAndIf.fs (3,5--3,33)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi b/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi
new file mode 100644
index 00000000000..833b02ad643
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi
@@ -0,0 +1,3 @@
+namespace Meh
+// comment!
+foo()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi.bsl
new file mode 100644
index 00000000000..11b115f2c7c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi.bsl
@@ -0,0 +1,13 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/CommentOnSingleLine,SignatureFile.fsi",
+      QualifiedNameOfFile CommentOnSingleLine,SignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, DeclaredNamespace, [], PreXmlDocEmpty, [], None,
+          /root/CommentOnSingleLine,SignatureFile.fsi (1,0--1,13),
+          { LeadingKeyword =
+             Namespace /root/CommentOnSingleLine,SignatureFile.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/CommentOnSingleLine,SignatureFile.fsi (2,0--2,11)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentOnSingleLine.fs b/tests/service/data/SyntaxTree/CommentOnSingleLine.fs
new file mode 100644
index 00000000000..3f7c61a45d1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CommentOnSingleLine.fs
@@ -0,0 +1,2 @@
+// comment!
+foo()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentOnSingleLine.fs.bsl b/tests/service/data/SyntaxTree/CommentOnSingleLine.fs.bsl
new file mode 100644
index 00000000000..39ff1307120
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CommentOnSingleLine.fs.bsl
@@ -0,0 +1,17 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/CommentOnSingleLine.fs", false,
+      QualifiedNameOfFile CommentOnSingleLine, [], [],
+      [SynModuleOrNamespace
+         ([CommentOnSingleLine], false, AnonModule,
+          [Expr
+             (App
+                (Atomic, false, Ident foo,
+                 Const (Unit, /root/CommentOnSingleLine.fs (2,3--2,5)),
+                 /root/CommentOnSingleLine.fs (2,0--2,5)),
+              /root/CommentOnSingleLine.fs (2,0--2,5))], PreXmlDocEmpty, [],
+          None, /root/CommentOnSingleLine.fs (2,0--2,5),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [LineComment /root/CommentOnSingleLine.fs (1,0--1,11)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs
new file mode 100644
index 00000000000..44e91680772
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs
@@ -0,0 +1,5 @@
+fun (x, _) 
+    ({ Y = h::_ }) 
+    (SomePattern(z)) 
+    -> 
+    x * y + z
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs.bsl
new file mode 100644
index 00000000000..128a3d771a8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs.bsl
@@ -0,0 +1,243 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ComplexArgumentsLambdaHasArrowRange.fs", false,
+      QualifiedNameOfFile ComplexArgumentsLambdaHasArrowRange, [], [],
+      [SynModuleOrNamespace
+         ([ComplexArgumentsLambdaHasArrowRange], false, AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (x, None, false, false, false,
+                        /root/ComplexArgumentsLambdaHasArrowRange.fs (1,5--1,6));
+                     Id
+                       (_arg3, None, true, false, false,
+                        /root/ComplexArgumentsLambdaHasArrowRange.fs (1,8--1,9))],
+                    /root/ComplexArgumentsLambdaHasArrowRange.fs (1,4--1,10)),
+                 Lambda
+                   (false, true,
+                    SimplePats
+                      ([Id
+                          (_arg2, None, true, false, false,
+                           /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,17))],
+                       /root/ComplexArgumentsLambdaHasArrowRange.fs (2,4--2,18)),
+                    Lambda
+                      (false, true,
+                       SimplePats
+                         ([Id
+                             (_arg1, None, true, false, false,
+                              /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,19))],
+                          /root/ComplexArgumentsLambdaHasArrowRange.fs (3,4--3,20)),
+                       Match
+                         (NoneAtInvisible, Ident _arg2,
+                          [SynMatchClause
+                             (Record
+                                ([(([], Y),
+                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (2,9--2,10),
+                                   ListCons
+                                     (Named
+                                        (SynIdent (h, None), false, None,
+                                         /root/ComplexArgumentsLambdaHasArrowRange.fs (2,11--2,12)),
+                                      Wild
+                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (2,14--2,15),
+                                      /root/ComplexArgumentsLambdaHasArrowRange.fs (2,11--2,15),
+                                      { ColonColonRange =
+                                         /root/ComplexArgumentsLambdaHasArrowRange.fs (2,12--2,14) }))],
+                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,17)),
+                              None,
+                              Match
+                                (NoneAtInvisible, Ident _arg1,
+                                 [SynMatchClause
+                                    (LongIdent
+                                       (SynLongIdent ([SomePattern], [], [None]),
+                                        None, None,
+                                        Pats
+                                          [Paren
+                                             (Named
+                                                (SynIdent (z, None), false, None,
+                                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (3,17--3,18)),
+                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (3,16--3,19))],
+                                        None,
+                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,19)),
+                                     None,
+                                     App
+                                       (NonAtomic, false,
+                                        App
+                                          (NonAtomic, true,
+                                           LongIdent
+                                             (false,
+                                              SynLongIdent
+                                                ([op_Addition], [],
+                                                 [Some (OriginalNotation "+")]),
+                                              None,
+                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (5,10--5,11)),
+                                           App
+                                             (NonAtomic, false,
+                                              App
+                                                (NonAtomic, true,
+                                                 LongIdent
+                                                   (false,
+                                                    SynLongIdent
+                                                      ([op_Multiply], [],
+                                                       [Some
+                                                          (OriginalNotation "*")]),
+                                                    None,
+                                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (5,6--5,7)),
+                                                 Ident x,
+                                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,7)),
+                                              Ident y,
+                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,9)),
+                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,11)),
+                                        Ident z,
+                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,13)),
+                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,19),
+                                     No, { ArrowRange = None
+                                           BarRange = None })],
+                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--5,13),
+                                 { MatchKeyword =
+                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--5,13)
+                                   WithKeyword =
+                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--5,13) }),
+                              /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,17),
+                              No, { ArrowRange = None
+                                    BarRange = None })],
+                          /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--5,13),
+                          { MatchKeyword =
+                             /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--5,13)
+                            WithKeyword =
+                             /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--5,13) }),
+                       None,
+                       /root/ComplexArgumentsLambdaHasArrowRange.fs (1,0--5,13),
+                       { ArrowRange =
+                          Some
+                            /root/ComplexArgumentsLambdaHasArrowRange.fs (4,4--4,6) }),
+                    None,
+                    /root/ComplexArgumentsLambdaHasArrowRange.fs (1,0--5,13),
+                    { ArrowRange =
+                       Some
+                         /root/ComplexArgumentsLambdaHasArrowRange.fs (4,4--4,6) }),
+                 Some
+                   ([Paren
+                       (Tuple
+                          (false,
+                           [Named
+                              (SynIdent (x, None), false, None,
+                               /root/ComplexArgumentsLambdaHasArrowRange.fs (1,5--1,6));
+                            Wild
+                              /root/ComplexArgumentsLambdaHasArrowRange.fs (1,8--1,9)],
+                           /root/ComplexArgumentsLambdaHasArrowRange.fs (1,5--1,9)),
+                        /root/ComplexArgumentsLambdaHasArrowRange.fs (1,4--1,10));
+                     Paren
+                       (Record
+                          ([(([], Y),
+                             /root/ComplexArgumentsLambdaHasArrowRange.fs (2,9--2,10),
+                             ListCons
+                               (Named
+                                  (SynIdent (h, None), false, None,
+                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (2,11--2,12)),
+                                Wild
+                                  /root/ComplexArgumentsLambdaHasArrowRange.fs (2,14--2,15),
+                                /root/ComplexArgumentsLambdaHasArrowRange.fs (2,11--2,15),
+                                { ColonColonRange =
+                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (2,12--2,14) }))],
+                           /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,17)),
+                        /root/ComplexArgumentsLambdaHasArrowRange.fs (2,4--2,18));
+                     Paren
+                       (LongIdent
+                          (SynLongIdent ([SomePattern], [], [None]), None, None,
+                           Pats
+                             [Paren
+                                (Named
+                                   (SynIdent (z, None), false, None,
+                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (3,17--3,18)),
+                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (3,16--3,19))],
+                           None,
+                           /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,19)),
+                        /root/ComplexArgumentsLambdaHasArrowRange.fs (3,4--3,20))],
+                    Match
+                      (NoneAtInvisible, Ident _arg2,
+                       [SynMatchClause
+                          (Record
+                             ([(([], Y),
+                                /root/ComplexArgumentsLambdaHasArrowRange.fs (2,9--2,10),
+                                ListCons
+                                  (Named
+                                     (SynIdent (h, None), false, None,
+                                      /root/ComplexArgumentsLambdaHasArrowRange.fs (2,11--2,12)),
+                                   Wild
+                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (2,14--2,15),
+                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (2,11--2,15),
+                                   { ColonColonRange =
+                                      /root/ComplexArgumentsLambdaHasArrowRange.fs (2,12--2,14) }))],
+                              /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,17)),
+                           None,
+                           Match
+                             (NoneAtInvisible, Ident _arg1,
+                              [SynMatchClause
+                                 (LongIdent
+                                    (SynLongIdent ([SomePattern], [], [None]),
+                                     None, None,
+                                     Pats
+                                       [Paren
+                                          (Named
+                                             (SynIdent (z, None), false, None,
+                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (3,17--3,18)),
+                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (3,16--3,19))],
+                                     None,
+                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,19)),
+                                  None,
+                                  App
+                                    (NonAtomic, false,
+                                     App
+                                       (NonAtomic, true,
+                                        LongIdent
+                                          (false,
+                                           SynLongIdent
+                                             ([op_Addition], [],
+                                              [Some (OriginalNotation "+")]),
+                                           None,
+                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (5,10--5,11)),
+                                        App
+                                          (NonAtomic, false,
+                                           App
+                                             (NonAtomic, true,
+                                              LongIdent
+                                                (false,
+                                                 SynLongIdent
+                                                   ([op_Multiply], [],
+                                                    [Some (OriginalNotation "*")]),
+                                                 None,
+                                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (5,6--5,7)),
+                                              Ident x,
+                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,7)),
+                                           Ident y,
+                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,9)),
+                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,11)),
+                                     Ident z,
+                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,13)),
+                                  /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,19),
+                                  No, { ArrowRange = None
+                                        BarRange = None })],
+                              /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--5,13),
+                              { MatchKeyword =
+                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--5,13)
+                                WithKeyword =
+                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--5,13) }),
+                           /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,17),
+                           No, { ArrowRange = None
+                                 BarRange = None })],
+                       /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--5,13),
+                       { MatchKeyword =
+                          /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--5,13)
+                         WithKeyword =
+                          /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--5,13) })),
+                 /root/ComplexArgumentsLambdaHasArrowRange.fs (1,0--5,13),
+                 { ArrowRange =
+                    Some /root/ComplexArgumentsLambdaHasArrowRange.fs (4,4--4,6) }),
+              /root/ComplexArgumentsLambdaHasArrowRange.fs (1,0--5,13))],
+          PreXmlDocEmpty, [], None,
+          /root/ComplexArgumentsLambdaHasArrowRange.fs (1,0--5,13),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs b/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs
new file mode 100644
index 00000000000..efeac2073b8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs
@@ -0,0 +1,5 @@
+let 
+#if !FOO
+    inline
+#endif
+    map f ar = Async.map (Result.map f) ar
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs.bsl
new file mode 100644
index 00000000000..adbcd3650b1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs.bsl
@@ -0,0 +1,80 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ConditionalDirectiveAroundInlineKeyword.fs", false,
+      QualifiedNameOfFile ConditionalDirectiveAroundInlineKeyword, [], [],
+      [SynModuleOrNamespace
+         ([ConditionalDirectiveAroundInlineKeyword], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, true, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some f)];
+                         [SynArgInfo ([], false, Some ar)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([map], [], [None]), None, None,
+                     Pats
+                       [Named
+                          (SynIdent (f, None), false, None,
+                           /root/ConditionalDirectiveAroundInlineKeyword.fs (5,8--5,9));
+                        Named
+                          (SynIdent (ar, None), false, None,
+                           /root/ConditionalDirectiveAroundInlineKeyword.fs (5,10--5,12))],
+                     None,
+                     /root/ConditionalDirectiveAroundInlineKeyword.fs (5,4--5,12)),
+                  None,
+                  App
+                    (NonAtomic, false,
+                     App
+                       (NonAtomic, false,
+                        LongIdent
+                          (false,
+                           SynLongIdent
+                             ([Async; map],
+                              [/root/ConditionalDirectiveAroundInlineKeyword.fs (5,20--5,21)],
+                              [None; None]), None,
+                           /root/ConditionalDirectiveAroundInlineKeyword.fs (5,15--5,24)),
+                        Paren
+                          (App
+                             (NonAtomic, false,
+                              LongIdent
+                                (false,
+                                 SynLongIdent
+                                   ([Result; map],
+                                    [/root/ConditionalDirectiveAroundInlineKeyword.fs (5,32--5,33)],
+                                    [None; None]), None,
+                                 /root/ConditionalDirectiveAroundInlineKeyword.fs (5,26--5,36)),
+                              Ident f,
+                              /root/ConditionalDirectiveAroundInlineKeyword.fs (5,26--5,38)),
+                           /root/ConditionalDirectiveAroundInlineKeyword.fs (5,25--5,26),
+                           Some
+                             /root/ConditionalDirectiveAroundInlineKeyword.fs (5,38--5,39),
+                           /root/ConditionalDirectiveAroundInlineKeyword.fs (5,25--5,39)),
+                        /root/ConditionalDirectiveAroundInlineKeyword.fs (5,15--5,39)),
+                     Ident ar,
+                     /root/ConditionalDirectiveAroundInlineKeyword.fs (5,15--5,42)),
+                  /root/ConditionalDirectiveAroundInlineKeyword.fs (5,4--5,12),
+                  NoneAtLet,
+                  { LeadingKeyword =
+                     Let
+                       /root/ConditionalDirectiveAroundInlineKeyword.fs (1,0--1,3)
+                    InlineKeyword =
+                     Some
+                       /root/ConditionalDirectiveAroundInlineKeyword.fs (3,4--3,10)
+                    EqualsRange =
+                     Some
+                       /root/ConditionalDirectiveAroundInlineKeyword.fs (5,13--5,14) })],
+              /root/ConditionalDirectiveAroundInlineKeyword.fs (1,0--5,42))],
+          PreXmlDocEmpty, [], None,
+          /root/ConditionalDirectiveAroundInlineKeyword.fs (1,0--5,42),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives =
+         [If
+            (Not (Ident "FOO"),
+             /root/ConditionalDirectiveAroundInlineKeyword.fs (2,0--2,8));
+          EndIf /root/ConditionalDirectiveAroundInlineKeyword.fs (4,0--4,6)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs b/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
new file mode 100644
index 00000000000..3fc551e4c5b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
@@ -0,0 +1,4 @@
+{ foo with
+        X
+            =
+                12 }
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
new file mode 100644
index 00000000000..66a0040950b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
@@ -0,0 +1,33 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs",
+      false,
+      QualifiedNameOfFile
+        CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField, [],
+      [],
+      [SynModuleOrNamespace
+         ([CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField],
+          false, AnonModule,
+          [Expr
+             (Record
+                (None,
+                 Some
+                   (Ident foo,
+                    (/root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,6--1,10),
+                     None)),
+                 [SynExprRecordField
+                    ((SynLongIdent ([X], [], [None]), true),
+                     Some
+                       /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,12--3,13),
+                     Some
+                       (Const
+                          (Int32 12,
+                           /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,16--4,18))),
+                     None)],
+                 /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--4,20)),
+              /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--4,20))],
+          PreXmlDocEmpty, [], None,
+          /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--4,20),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs b/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs
new file mode 100644
index 00000000000..b24a2df8c18
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs
@@ -0,0 +1 @@
+let (+) a b = a + b
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs.bsl b/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs.bsl
new file mode 100644
index 00000000000..78724806ffd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs.bsl
@@ -0,0 +1,55 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/CustomOperatorDefinition.fs", false,
+      QualifiedNameOfFile CustomOperatorDefinition, [], [],
+      [SynModuleOrNamespace
+         ([CustomOperatorDefinition], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some a)];
+                         [SynArgInfo ([], false, Some b)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent
+                       ([op_Addition], [],
+                        [Some
+                           (OriginalNotationWithParen
+                              (/root/CustomOperatorDefinition.fs (1,4--1,5), "+",
+                               /root/CustomOperatorDefinition.fs (1,6--1,7)))]),
+                     None, None,
+                     Pats
+                       [Named
+                          (SynIdent (a, None), false, None,
+                           /root/CustomOperatorDefinition.fs (1,8--1,9));
+                        Named
+                          (SynIdent (b, None), false, None,
+                           /root/CustomOperatorDefinition.fs (1,10--1,11))],
+                     None, /root/CustomOperatorDefinition.fs (1,4--1,11)), None,
+                  App
+                    (NonAtomic, false,
+                     App
+                       (NonAtomic, true,
+                        LongIdent
+                          (false,
+                           SynLongIdent
+                             ([op_Addition], [], [Some (OriginalNotation "+")]),
+                           None, /root/CustomOperatorDefinition.fs (1,16--1,17)),
+                        Ident a, /root/CustomOperatorDefinition.fs (1,14--1,17)),
+                     Ident b, /root/CustomOperatorDefinition.fs (1,14--1,19)),
+                  /root/CustomOperatorDefinition.fs (1,4--1,11), NoneAtLet,
+                  { LeadingKeyword =
+                     Let /root/CustomOperatorDefinition.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some /root/CustomOperatorDefinition.fs (1,12--1,13) })],
+              /root/CustomOperatorDefinition.fs (1,0--1,19))], PreXmlDocEmpty,
+          [], None, /root/CustomOperatorDefinition.fs (1,0--1,19),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs b/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs
new file mode 100644
index 00000000000..d17e0b80a68
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs
@@ -0,0 +1,4 @@
+namespace TypeEquality
+
+/// A type for witnessing type equality between 'a and 'b
+type Teq<'a, 'b>
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
new file mode 100644
index 00000000000..455556e5165
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
@@ -0,0 +1,39 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs", false,
+      QualifiedNameOfFile DeclaredNamespaceRangeShouldStartAtNamespaceKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([TypeEquality], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([],
+                     Some
+                       (PostfixList
+                          ([SynTyparDecl ([], SynTypar (a, None, false));
+                            SynTyparDecl ([], SynTypar (b, None, false))], [],
+                           /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,8--4,16))),
+                     [], [Teq],
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     true, None,
+                     /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,5--4,8)),
+                  Simple
+                    (None
+                       /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,5--4,8),
+                     /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,5--4,8)),
+                  [], None,
+                  /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (3,0--4,8),
+                  { LeadingKeyword =
+                     Type
+                       /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,0--4,4)
+                    EqualsRange = None
+                    WithKeyword = None })],
+              /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (3,0--4,8))],
+          PreXmlDocEmpty, [], None,
+          /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (1,0--4,8),
+          { LeadingKeyword =
+             Namespace
+               /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (1,0--1,9) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs b/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs
new file mode 100644
index 00000000000..269c362cdce
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs
@@ -0,0 +1,9 @@
+if a then
+    b
+elif c then
+    d
+else
+        if e then
+            f
+        else
+            g
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs.bsl
new file mode 100644
index 00000000000..73bc9edae98
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs.bsl
@@ -0,0 +1,48 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/DeeplyNestedIfThenElse.fs", false,
+      QualifiedNameOfFile DeeplyNestedIfThenElse, [], [],
+      [SynModuleOrNamespace
+         ([DeeplyNestedIfThenElse], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b,
+                 Some
+                   (IfThenElse
+                      (Ident c, Ident d,
+                       Some
+                         (IfThenElse
+                            (Ident e, Ident f, Some (Ident g),
+                             Yes /root/DeeplyNestedIfThenElse.fs (6,8--6,17),
+                             false, /root/DeeplyNestedIfThenElse.fs (6,8--9,13),
+                             { IfKeyword =
+                                /root/DeeplyNestedIfThenElse.fs (6,8--6,10)
+                               IsElif = false
+                               ThenKeyword =
+                                /root/DeeplyNestedIfThenElse.fs (6,13--6,17)
+                               ElseKeyword =
+                                Some /root/DeeplyNestedIfThenElse.fs (8,8--8,12)
+                               IfToThenRange =
+                                /root/DeeplyNestedIfThenElse.fs (6,8--6,17) })),
+                       Yes /root/DeeplyNestedIfThenElse.fs (3,0--3,11), false,
+                       /root/DeeplyNestedIfThenElse.fs (3,0--9,13),
+                       { IfKeyword = /root/DeeplyNestedIfThenElse.fs (3,0--3,4)
+                         IsElif = true
+                         ThenKeyword =
+                          /root/DeeplyNestedIfThenElse.fs (3,7--3,11)
+                         ElseKeyword =
+                          Some /root/DeeplyNestedIfThenElse.fs (5,0--5,4)
+                         IfToThenRange =
+                          /root/DeeplyNestedIfThenElse.fs (3,0--3,11) })),
+                 Yes /root/DeeplyNestedIfThenElse.fs (1,0--1,9), false,
+                 /root/DeeplyNestedIfThenElse.fs (1,0--9,13),
+                 { IfKeyword = /root/DeeplyNestedIfThenElse.fs (1,0--1,2)
+                   IsElif = false
+                   ThenKeyword = /root/DeeplyNestedIfThenElse.fs (1,5--1,9)
+                   ElseKeyword = None
+                   IfToThenRange = /root/DeeplyNestedIfThenElse.fs (1,0--1,9) }),
+              /root/DeeplyNestedIfThenElse.fs (1,0--9,13))], PreXmlDocEmpty, [],
+          None, /root/DeeplyNestedIfThenElse.fs (1,0--9,13),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DefaultKeyword.fsi b/tests/service/data/SyntaxTree/DefaultKeyword.fsi
new file mode 100644
index 00000000000..10ea02f5280
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DefaultKeyword.fsi
@@ -0,0 +1,4 @@
+namespace X
+
+type Y =
+    default F : int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DefaultKeyword.fsi.bsl b/tests/service/data/SyntaxTree/DefaultKeyword.fsi.bsl
new file mode 100644
index 00000000000..1897b1d0b09
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DefaultKeyword.fsi.bsl
@@ -0,0 +1,44 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/DefaultKeyword.fsi", QualifiedNameOfFile DefaultKeyword, [], [],
+      [SynModuleOrNamespaceSig
+         ([X], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Y],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/DefaultKeyword.fsi (3,5--3,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynValSig
+                           ([], SynIdent (F, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None, /root/DefaultKeyword.fsi (4,4--4,19),
+                            { LeadingKeyword =
+                               Default /root/DefaultKeyword.fsi (4,4--4,11)
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = true
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/DefaultKeyword.fsi (4,4--4,19),
+                         { GetSetKeywords = None })],
+                     /root/DefaultKeyword.fsi (4,4--4,19)), [],
+                  /root/DefaultKeyword.fsi (3,5--4,19),
+                  { LeadingKeyword = Type /root/DefaultKeyword.fsi (3,0--3,4)
+                    EqualsRange = Some /root/DefaultKeyword.fsi (3,7--3,8)
+                    WithKeyword = None })], /root/DefaultKeyword.fsi (3,0--4,19))],
+          PreXmlDocEmpty, [], None, /root/DefaultKeyword.fsi (1,0--4,19),
+          { LeadingKeyword = Namespace /root/DefaultKeyword.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DefaultValKeyword.fs b/tests/service/data/SyntaxTree/DefaultValKeyword.fs
new file mode 100644
index 00000000000..fc8cd6b33f0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DefaultValKeyword.fs
@@ -0,0 +1,2 @@
+type Foo =
+    default val A : int = 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DefaultValKeyword.fs.bsl b/tests/service/data/SyntaxTree/DefaultValKeyword.fs.bsl
new file mode 100644
index 00000000000..935f1283a7e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DefaultValKeyword.fs.bsl
@@ -0,0 +1,51 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/DefaultValKeyword.fs", false, QualifiedNameOfFile DefaultValKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([DefaultValKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/DefaultValKeyword.fs (1,5--1,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [AutoProperty
+                        ([], false, A,
+                         Some (LongIdent (SynLongIdent ([int], [], [None]))),
+                         Member, { IsInstance = true
+                                   IsDispatchSlot = false
+                                   IsOverrideOrExplicitImpl = true
+                                   IsFinal = false
+                                   GetterOrSetterIsCompilerGenerated = false
+                                   MemberKind = Member },
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = true
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertySet },
+                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None,
+                         Const
+                           (Int32 1, /root/DefaultValKeyword.fs (2,26--2,27)),
+                         /root/DefaultValKeyword.fs (2,4--2,27),
+                         { LeadingKeyword =
+                            DefaultVal
+                              (/root/DefaultValKeyword.fs (2,4--2,11),
+                               /root/DefaultValKeyword.fs (2,12--2,15))
+                           WithKeyword = None
+                           EqualsRange =
+                            Some /root/DefaultValKeyword.fs (2,24--2,25)
+                           GetSetKeywords = None })],
+                     /root/DefaultValKeyword.fs (2,4--2,27)), [], None,
+                  /root/DefaultValKeyword.fs (1,5--2,27),
+                  { LeadingKeyword = Type /root/DefaultValKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/DefaultValKeyword.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/DefaultValKeyword.fs (1,0--2,27))], PreXmlDocEmpty, [], None,
+          /root/DefaultValKeyword.fs (1,0--2,27), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs
new file mode 100644
index 00000000000..3ed9b6dbdae
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs
@@ -0,0 +1 @@
+fun { X = x } -> x * 2
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs.bsl
new file mode 100644
index 00000000000..3ab71dd40b6
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs.bsl
@@ -0,0 +1,101 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/DestructedLambdaHasArrowRange.fs", false,
+      QualifiedNameOfFile DestructedLambdaHasArrowRange, [], [],
+      [SynModuleOrNamespace
+         ([DestructedLambdaHasArrowRange], false, AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (_arg1, None, true, false, false,
+                        /root/DestructedLambdaHasArrowRange.fs (1,4--1,13))],
+                    /root/DestructedLambdaHasArrowRange.fs (1,4--1,13)),
+                 Match
+                   (NoneAtInvisible, Ident _arg1,
+                    [SynMatchClause
+                       (Record
+                          ([(([], X),
+                             /root/DestructedLambdaHasArrowRange.fs (1,8--1,9),
+                             Named
+                               (SynIdent (x, None), false, None,
+                                /root/DestructedLambdaHasArrowRange.fs (1,10--1,11)))],
+                           /root/DestructedLambdaHasArrowRange.fs (1,4--1,13)),
+                        None,
+                        App
+                          (NonAtomic, false,
+                           App
+                             (NonAtomic, true,
+                              LongIdent
+                                (false,
+                                 SynLongIdent
+                                   ([op_Multiply], [],
+                                    [Some (OriginalNotation "*")]), None,
+                                 /root/DestructedLambdaHasArrowRange.fs (1,19--1,20)),
+                              Ident x,
+                              /root/DestructedLambdaHasArrowRange.fs (1,17--1,20)),
+                           Const
+                             (Int32 2,
+                              /root/DestructedLambdaHasArrowRange.fs (1,21--1,22)),
+                           /root/DestructedLambdaHasArrowRange.fs (1,17--1,22)),
+                        /root/DestructedLambdaHasArrowRange.fs (1,4--1,13), No,
+                        { ArrowRange = None
+                          BarRange = None })],
+                    /root/DestructedLambdaHasArrowRange.fs (1,4--1,22),
+                    { MatchKeyword =
+                       /root/DestructedLambdaHasArrowRange.fs (1,4--1,22)
+                      WithKeyword =
+                       /root/DestructedLambdaHasArrowRange.fs (1,4--1,22) }),
+                 Some
+                   ([Record
+                       ([(([], X),
+                          /root/DestructedLambdaHasArrowRange.fs (1,8--1,9),
+                          Named
+                            (SynIdent (x, None), false, None,
+                             /root/DestructedLambdaHasArrowRange.fs (1,10--1,11)))],
+                        /root/DestructedLambdaHasArrowRange.fs (1,4--1,13))],
+                    Match
+                      (NoneAtInvisible, Ident _arg1,
+                       [SynMatchClause
+                          (Record
+                             ([(([], X),
+                                /root/DestructedLambdaHasArrowRange.fs (1,8--1,9),
+                                Named
+                                  (SynIdent (x, None), false, None,
+                                   /root/DestructedLambdaHasArrowRange.fs (1,10--1,11)))],
+                              /root/DestructedLambdaHasArrowRange.fs (1,4--1,13)),
+                           None,
+                           App
+                             (NonAtomic, false,
+                              App
+                                (NonAtomic, true,
+                                 LongIdent
+                                   (false,
+                                    SynLongIdent
+                                      ([op_Multiply], [],
+                                       [Some (OriginalNotation "*")]), None,
+                                    /root/DestructedLambdaHasArrowRange.fs (1,19--1,20)),
+                                 Ident x,
+                                 /root/DestructedLambdaHasArrowRange.fs (1,17--1,20)),
+                              Const
+                                (Int32 2,
+                                 /root/DestructedLambdaHasArrowRange.fs (1,21--1,22)),
+                              /root/DestructedLambdaHasArrowRange.fs (1,17--1,22)),
+                           /root/DestructedLambdaHasArrowRange.fs (1,4--1,13),
+                           No, { ArrowRange = None
+                                 BarRange = None })],
+                       /root/DestructedLambdaHasArrowRange.fs (1,4--1,22),
+                       { MatchKeyword =
+                          /root/DestructedLambdaHasArrowRange.fs (1,4--1,22)
+                         WithKeyword =
+                          /root/DestructedLambdaHasArrowRange.fs (1,4--1,22) })),
+                 /root/DestructedLambdaHasArrowRange.fs (1,0--1,22),
+                 { ArrowRange =
+                    Some /root/DestructedLambdaHasArrowRange.fs (1,14--1,16) }),
+              /root/DestructedLambdaHasArrowRange.fs (1,0--1,22))],
+          PreXmlDocEmpty, [], None,
+          /root/DestructedLambdaHasArrowRange.fs (1,0--1,22),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs b/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs
new file mode 100644
index 00000000000..bc6aeda6ce3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs
@@ -0,0 +1,2 @@
+(+) a b
+op_Addition a b
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs.bsl b/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs.bsl
new file mode 100644
index 00000000000..6fa22d49e95
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs.bsl
@@ -0,0 +1,41 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/DetectDifferenceBetweenCompiledOperators.fs", false,
+      QualifiedNameOfFile DetectDifferenceBetweenCompiledOperators, [], [],
+      [SynModuleOrNamespace
+         ([DetectDifferenceBetweenCompiledOperators], false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false,
+                 App
+                   (NonAtomic, false,
+                    LongIdent
+                      (false,
+                       SynLongIdent
+                         ([op_Addition], [],
+                          [Some
+                             (OriginalNotationWithParen
+                                (/root/DetectDifferenceBetweenCompiledOperators.fs (1,0--1,1),
+                                 "+",
+                                 /root/DetectDifferenceBetweenCompiledOperators.fs (1,2--1,3)))]),
+                       None,
+                       /root/DetectDifferenceBetweenCompiledOperators.fs (1,0--1,3)),
+                    Ident a,
+                    /root/DetectDifferenceBetweenCompiledOperators.fs (1,0--1,5)),
+                 Ident b,
+                 /root/DetectDifferenceBetweenCompiledOperators.fs (1,0--1,7)),
+              /root/DetectDifferenceBetweenCompiledOperators.fs (1,0--1,7));
+           Expr
+             (App
+                (NonAtomic, false,
+                 App
+                   (NonAtomic, false, Ident op_Addition, Ident a,
+                    /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,13)),
+                 Ident b,
+                 /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,15)),
+              /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,15))],
+          PreXmlDocEmpty, [], None,
+          /root/DetectDifferenceBetweenCompiledOperators.fs (1,0--2,15),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi
new file mode 100644
index 00000000000..d0aee5943ba
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi
@@ -0,0 +1,9 @@
+namespace Foobar
+
+val v : int =
+(*
+#if DEBUG
+()
+#endif
+*)
+42
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi.bsl
new file mode 100644
index 00000000000..a6e00f498ac
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi.bsl
@@ -0,0 +1,37 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi",
+      QualifiedNameOfFile
+        DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Foobar], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (v, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 Some
+                   (Const
+                      (Int32 42,
+                       /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (9,0--9,2))),
+                 /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (3,0--9,2),
+                 { LeadingKeyword =
+                    Val
+                      /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (3,0--3,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange =
+                    Some
+                      /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (3,12--3,13) }),
+              /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (3,0--9,2))],
+          PreXmlDocEmpty, [], None,
+          /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (1,0--9,2),
+          { LeadingKeyword =
+             Namespace
+               /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [BlockComment
+            /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (4,0--8,2)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs
new file mode 100644
index 00000000000..167dd88a795
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs
@@ -0,0 +1,7 @@
+let v =
+(*
+#if DEBUG
+()
+#endif
+*)
+42
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
new file mode 100644
index 00000000000..21b3369fd4f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
@@ -0,0 +1,41 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs", false,
+      QualifiedNameOfFile DirectivesInMultilineCommentAreNotReportedAsTrivia, [],
+      [],
+      [SynModuleOrNamespace
+         ([DirectivesInMultilineCommentAreNotReportedAsTrivia], false,
+          AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,4--1,5)),
+                  None,
+                  Const
+                    (Int32 42,
+                     /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (7,0--7,2)),
+                  /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,4--1,5),
+                  Yes
+                    /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,0--7,2),
+                  { LeadingKeyword =
+                     Let
+                       /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,6--1,7) })],
+              /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,0--7,2))],
+          PreXmlDocEmpty, [], None,
+          /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,0--7,2),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [BlockComment
+            /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--6,2)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi
new file mode 100644
index 00000000000..3c53f3d5d91
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi
@@ -0,0 +1,8 @@
+namespace Foobar
+
+let v : string = \"\"\"
+#if DEBUG
+()
+#endif
+42
+\"\"\"
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi.bsl
new file mode 100644
index 00000000000..48d82cc3072
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi.bsl
@@ -0,0 +1,13 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi",
+      QualifiedNameOfFile
+        DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Foobar], false, DeclaredNamespace, [], PreXmlDocEmpty, [], None,
+          /root/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi (1,0--1,16),
+          { LeadingKeyword =
+             Namespace
+               /root/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs
new file mode 100644
index 00000000000..63b17a70ac1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs
@@ -0,0 +1,6 @@
+let v = \"\"\"
+#if DEBUG
+()
+#endif
+42
+\"\"\"
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
new file mode 100644
index 00000000000..2b43709c8a0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
@@ -0,0 +1,37 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs", false,
+      QualifiedNameOfFile DirectivesInMultilineStringAreNotReportedAsTrivia, [],
+      [],
+      [SynModuleOrNamespace
+         ([DirectivesInMultilineStringAreNotReportedAsTrivia], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,4--1,5)),
+                  None,
+                  ArbitraryAfterError
+                    ("localBinding1",
+                     /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,7--1,7)),
+                  /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,4--1,5),
+                  Yes
+                    /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,4--1,7),
+                  { LeadingKeyword =
+                     Let
+                       /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,6--1,7) })],
+              /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,0--1,7))],
+          PreXmlDocEmpty, [], None,
+          /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,0--6,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DoKeyword.fs b/tests/service/data/SyntaxTree/DoKeyword.fs
new file mode 100644
index 00000000000..6ad35567a34
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DoKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    do ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DoKeyword.fs.bsl b/tests/service/data/SyntaxTree/DoKeyword.fs.bsl
new file mode 100644
index 00000000000..879728af9bc
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DoKeyword.fs.bsl
@@ -0,0 +1,36 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/DoKeyword.fs", false, QualifiedNameOfFile DoKeyword, [], [],
+      [SynModuleOrNamespace
+         ([DoKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/DoKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [LetBindings
+                        ([SynBinding
+                            (None, Do, false, false, [], PreXmlDocEmpty,
+                             SynValData
+                               (None,
+                                SynValInfo ([], SynArgInfo ([], false, None)),
+                                None),
+                             Const (Unit, /root/DoKeyword.fs (2,4--2,9)), None,
+                             Const (Unit, /root/DoKeyword.fs (2,7--2,9)),
+                             /root/DoKeyword.fs (2,4--2,9), NoneAtDo,
+                             { LeadingKeyword = Do /root/DoKeyword.fs (2,4--2,6)
+                               InlineKeyword = None
+                               EqualsRange = None })], false, false,
+                         /root/DoKeyword.fs (2,4--2,9))],
+                     /root/DoKeyword.fs (2,4--2,9)), [], None,
+                  /root/DoKeyword.fs (1,5--2,9),
+                  { LeadingKeyword = Type /root/DoKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/DoKeyword.fs (1,7--1,8)
+                    WithKeyword = None })], /root/DoKeyword.fs (1,0--2,9))],
+          PreXmlDocEmpty, [], None, /root/DoKeyword.fs (1,0--2,9),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DoStaticKeyword.fs b/tests/service/data/SyntaxTree/DoStaticKeyword.fs
new file mode 100644
index 00000000000..5badcd7f29b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DoStaticKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    static do ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DoStaticKeyword.fs.bsl b/tests/service/data/SyntaxTree/DoStaticKeyword.fs.bsl
new file mode 100644
index 00000000000..619fd81c636
--- /dev/null
+++ b/tests/service/data/SyntaxTree/DoStaticKeyword.fs.bsl
@@ -0,0 +1,41 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/DoStaticKeyword.fs", false, QualifiedNameOfFile DoStaticKeyword, [],
+      [],
+      [SynModuleOrNamespace
+         ([DoStaticKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/DoStaticKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [LetBindings
+                        ([SynBinding
+                            (None, Do, false, false, [], PreXmlDocEmpty,
+                             SynValData
+                               (None,
+                                SynValInfo ([], SynArgInfo ([], false, None)),
+                                None),
+                             Const (Unit, /root/DoStaticKeyword.fs (2,11--2,16)),
+                             None,
+                             Const (Unit, /root/DoStaticKeyword.fs (2,14--2,16)),
+                             /root/DoStaticKeyword.fs (2,11--2,16), NoneAtDo,
+                             { LeadingKeyword =
+                                StaticDo
+                                  (/root/DoStaticKeyword.fs (2,4--2,10),
+                                   /root/DoStaticKeyword.fs (2,11--2,13))
+                               InlineKeyword = None
+                               EqualsRange = None })], true, false,
+                         /root/DoStaticKeyword.fs (2,4--2,16))],
+                     /root/DoStaticKeyword.fs (2,4--2,16)), [], None,
+                  /root/DoStaticKeyword.fs (1,5--2,16),
+                  { LeadingKeyword = Type /root/DoStaticKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/DoStaticKeyword.fs (1,7--1,8)
+                    WithKeyword = None })], /root/DoStaticKeyword.fs (1,0--2,16))],
+          PreXmlDocEmpty, [], None, /root/DoStaticKeyword.fs (1,0--2,16),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs b/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs
new file mode 100644
index 00000000000..c129fcfc192
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs
@@ -0,0 +1 @@
+if a then b else c
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs.bsl
new file mode 100644
index 00000000000..a31c19c89d7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs.bsl
@@ -0,0 +1,25 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ElseKeywordInSimpleIfThenElse.fs", false,
+      QualifiedNameOfFile ElseKeywordInSimpleIfThenElse, [], [],
+      [SynModuleOrNamespace
+         ([ElseKeywordInSimpleIfThenElse], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b, Some (Ident c),
+                 Yes /root/ElseKeywordInSimpleIfThenElse.fs (1,0--1,9), false,
+                 /root/ElseKeywordInSimpleIfThenElse.fs (1,0--1,18),
+                 { IfKeyword = /root/ElseKeywordInSimpleIfThenElse.fs (1,0--1,2)
+                   IsElif = false
+                   ThenKeyword =
+                    /root/ElseKeywordInSimpleIfThenElse.fs (1,5--1,9)
+                   ElseKeyword =
+                    Some /root/ElseKeywordInSimpleIfThenElse.fs (1,12--1,16)
+                   IfToThenRange =
+                    /root/ElseKeywordInSimpleIfThenElse.fs (1,0--1,9) }),
+              /root/ElseKeywordInSimpleIfThenElse.fs (1,0--1,18))],
+          PreXmlDocEmpty, [], None,
+          /root/ElseKeywordInSimpleIfThenElse.fs (1,0--1,18),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi
new file mode 100644
index 00000000000..d7a9a200183
--- /dev/null
+++ b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi
@@ -0,0 +1,4 @@
+module Meh
+
+type X =
+    member a : int = 10
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi.bsl b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
new file mode 100644
index 00000000000..c5ba228a335
--- /dev/null
+++ b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
@@ -0,0 +1,62 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/EqualsTokenIsPresentInSynValSigMember.fsi", QualifiedNameOfFile Meh,
+      [], [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, NamedModule,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/EqualsTokenIsPresentInSynValSigMember.fsi (3,5--3,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynValSig
+                           ([], SynIdent (a, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            Some
+                              (Const
+                                 (Int32 10,
+                                  /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,21--4,23))),
+                            /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,4--4,23),
+                            { LeadingKeyword =
+                               Member
+                                 /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,4--4,10)
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,19--4,20) }),
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,4--4,23),
+                         { GetSetKeywords = None })],
+                     /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,4--4,23)),
+                  [],
+                  /root/EqualsTokenIsPresentInSynValSigMember.fsi (3,5--4,23),
+                  { LeadingKeyword =
+                     Type
+                       /root/EqualsTokenIsPresentInSynValSigMember.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some
+                       /root/EqualsTokenIsPresentInSynValSigMember.fsi (3,7--3,8)
+                    WithKeyword = None })],
+              /root/EqualsTokenIsPresentInSynValSigMember.fsi (3,0--4,23))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/EqualsTokenIsPresentInSynValSigMember.fsi (1,0--4,23),
+          { LeadingKeyword =
+             Module /root/EqualsTokenIsPresentInSynValSigMember.fsi (1,0--1,6) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi
new file mode 100644
index 00000000000..bb6a882c0e9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi
@@ -0,0 +1,3 @@
+module Meh
+
+val a : int = 9
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi.bsl b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
new file mode 100644
index 00000000000..7ce6bd5bcf8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
@@ -0,0 +1,32 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/EqualsTokenIsPresentInSynValSigValue.fsi", QualifiedNameOfFile Meh,
+      [], [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, NamedModule,
+          [Val
+             (SynValSig
+                ([], SynIdent (a, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 Some
+                   (Const
+                      (Int32 9,
+                       /root/EqualsTokenIsPresentInSynValSigValue.fsi (3,14--3,15))),
+                 /root/EqualsTokenIsPresentInSynValSigValue.fsi (3,0--3,15),
+                 { LeadingKeyword =
+                    Val
+                      /root/EqualsTokenIsPresentInSynValSigValue.fsi (3,0--3,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange =
+                    Some
+                      /root/EqualsTokenIsPresentInSynValSigValue.fsi (3,12--3,13) }),
+              /root/EqualsTokenIsPresentInSynValSigValue.fsi (3,0--3,15))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/EqualsTokenIsPresentInSynValSigValue.fsi (1,0--3,15),
+          { LeadingKeyword =
+             Module /root/EqualsTokenIsPresentInSynValSigValue.fsi (1,0--1,6) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ExternKeyword.fs b/tests/service/data/SyntaxTree/ExternKeyword.fs
new file mode 100644
index 00000000000..b64978d72f5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ExternKeyword.fs
@@ -0,0 +1 @@
+extern void Meh()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ExternKeyword.fs.bsl b/tests/service/data/SyntaxTree/ExternKeyword.fs.bsl
new file mode 100644
index 00000000000..a7af819bef2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ExternKeyword.fs.bsl
@@ -0,0 +1,52 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ExternKeyword.fs", false, QualifiedNameOfFile ExternKeyword, [], [],
+      [SynModuleOrNamespace
+         ([ExternKeyword], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([Meh], [], [None]), None,
+                     Some (SynValTyparDecls (None, false)),
+                     Pats
+                       [Tuple (false, [], /root/ExternKeyword.fs (1,15--1,16))],
+                     None, /root/ExternKeyword.fs (1,12--1,15)),
+                  Some
+                    (SynBindingReturnInfo
+                       (App
+                          (LongIdent
+                             (SynLongIdent
+                                ([unit], [], [Some (OriginalNotation "void")])),
+                           None, [], [], None, false,
+                           /root/ExternKeyword.fs (1,7--1,11)),
+                        /root/ExternKeyword.fs (1,7--1,11), [],
+                        { ColonRange = None })),
+                  Typed
+                    (App
+                       (NonAtomic, false, Ident failwith,
+                        Const
+                          (String
+                             ("extern was not given a DllImport attribute",
+                              Regular, /root/ExternKeyword.fs (1,16--1,17)),
+                           /root/ExternKeyword.fs (1,16--1,17)),
+                        /root/ExternKeyword.fs (1,0--1,17)),
+                     App
+                       (LongIdent
+                          (SynLongIdent
+                             ([unit], [], [Some (OriginalNotation "void")])),
+                        None, [], [], None, false,
+                        /root/ExternKeyword.fs (1,7--1,11)),
+                     /root/ExternKeyword.fs (1,0--1,17)),
+                  /root/ExternKeyword.fs (1,0--1,17), NoneAtInvisible,
+                  { LeadingKeyword = Extern /root/ExternKeyword.fs (1,0--1,6)
+                    InlineKeyword = None
+                    EqualsRange = None })], /root/ExternKeyword.fs (1,0--1,17))],
+          PreXmlDocEmpty, [], None, /root/ExternKeyword.fs (1,0--1,17),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs b/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs
new file mode 100644
index 00000000000..a9c60114b21
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs
@@ -0,0 +1 @@
+extern void GetProcessHeap()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs.bsl b/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs.bsl
new file mode 100644
index 00000000000..b82b9f3b6a8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs.bsl
@@ -0,0 +1,60 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ExternKeywordIsPresentInTrivia.fs", false,
+      QualifiedNameOfFile ExternKeywordIsPresentInTrivia, [], [],
+      [SynModuleOrNamespace
+         ([ExternKeywordIsPresentInTrivia], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([GetProcessHeap], [], [None]), None,
+                     Some (SynValTyparDecls (None, false)),
+                     Pats
+                       [Tuple
+                          (false, [],
+                           /root/ExternKeywordIsPresentInTrivia.fs (1,26--1,27))],
+                     None, /root/ExternKeywordIsPresentInTrivia.fs (1,12--1,26)),
+                  Some
+                    (SynBindingReturnInfo
+                       (App
+                          (LongIdent
+                             (SynLongIdent
+                                ([unit], [], [Some (OriginalNotation "void")])),
+                           None, [], [], None, false,
+                           /root/ExternKeywordIsPresentInTrivia.fs (1,7--1,11)),
+                        /root/ExternKeywordIsPresentInTrivia.fs (1,7--1,11), [],
+                        { ColonRange = None })),
+                  Typed
+                    (App
+                       (NonAtomic, false, Ident failwith,
+                        Const
+                          (String
+                             ("extern was not given a DllImport attribute",
+                              Regular,
+                              /root/ExternKeywordIsPresentInTrivia.fs (1,27--1,28)),
+                           /root/ExternKeywordIsPresentInTrivia.fs (1,27--1,28)),
+                        /root/ExternKeywordIsPresentInTrivia.fs (1,0--1,28)),
+                     App
+                       (LongIdent
+                          (SynLongIdent
+                             ([unit], [], [Some (OriginalNotation "void")])),
+                        None, [], [], None, false,
+                        /root/ExternKeywordIsPresentInTrivia.fs (1,7--1,11)),
+                     /root/ExternKeywordIsPresentInTrivia.fs (1,0--1,28)),
+                  /root/ExternKeywordIsPresentInTrivia.fs (1,0--1,28),
+                  NoneAtInvisible,
+                  { LeadingKeyword =
+                     Extern /root/ExternKeywordIsPresentInTrivia.fs (1,0--1,6)
+                    InlineKeyword = None
+                    EqualsRange = None })],
+              /root/ExternKeywordIsPresentInTrivia.fs (1,0--1,28))],
+          PreXmlDocEmpty, [], None,
+          /root/ExternKeywordIsPresentInTrivia.fs (1,0--1,28),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs b/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs
new file mode 100644
index 00000000000..c41b917e43b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs
@@ -0,0 +1,4 @@
+type X =
+    member inline x.Y 
+        with inline get () = 4
+        and inline set y = ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs.bsl
new file mode 100644
index 00000000000..9e71505bebe
--- /dev/null
+++ b/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs.bsl
@@ -0,0 +1,131 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/GetSetMemberWithInlineKeyword.fs", false,
+      QualifiedNameOfFile GetSetMemberWithInlineKeyword, [], [],
+      [SynModuleOrNamespace
+         ([GetSetMemberWithInlineKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/GetSetMemberWithInlineKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [GetSetMember
+                        (Some
+                           (SynBinding
+                              (None, Normal, true, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertyGet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)]; []],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([x; Y],
+                                     [/root/GetSetMemberWithInlineKeyword.fs (2,19--2,20)],
+                                     [None; None]), Some get, None,
+                                  Pats
+                                    [Paren
+                                       (Const
+                                          (Unit,
+                                           /root/GetSetMemberWithInlineKeyword.fs (3,24--3,26)),
+                                        /root/GetSetMemberWithInlineKeyword.fs (3,24--3,26))],
+                                  None,
+                                  /root/GetSetMemberWithInlineKeyword.fs (3,20--3,26)),
+                               None,
+                               Const
+                                 (Int32 4,
+                                  /root/GetSetMemberWithInlineKeyword.fs (3,29--3,30)),
+                               /root/GetSetMemberWithInlineKeyword.fs (3,20--3,26),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/GetSetMemberWithInlineKeyword.fs (2,4--2,10)
+                                 InlineKeyword =
+                                  Some
+                                    /root/GetSetMemberWithInlineKeyword.fs (3,13--3,19)
+                                 EqualsRange =
+                                  Some
+                                    /root/GetSetMemberWithInlineKeyword.fs (3,27--3,28) })),
+                         Some
+                           (SynBinding
+                              (None, Normal, true, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertySet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)];
+                                      [SynArgInfo ([], false, Some y)]],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([x; Y],
+                                     [/root/GetSetMemberWithInlineKeyword.fs (2,19--2,20)],
+                                     [None; None]), Some set, None,
+                                  Pats
+                                    [Named
+                                       (SynIdent (y, None), false, None,
+                                        /root/GetSetMemberWithInlineKeyword.fs (4,23--4,24))],
+                                  None,
+                                  /root/GetSetMemberWithInlineKeyword.fs (4,19--4,24)),
+                               None,
+                               Const
+                                 (Unit,
+                                  /root/GetSetMemberWithInlineKeyword.fs (4,27--4,29)),
+                               /root/GetSetMemberWithInlineKeyword.fs (4,19--4,24),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/GetSetMemberWithInlineKeyword.fs (2,4--2,10)
+                                 InlineKeyword =
+                                  Some
+                                    /root/GetSetMemberWithInlineKeyword.fs (4,12--4,18)
+                                 EqualsRange =
+                                  Some
+                                    /root/GetSetMemberWithInlineKeyword.fs (4,25--4,26) })),
+                         /root/GetSetMemberWithInlineKeyword.fs (2,4--4,29),
+                         { InlineKeyword =
+                            Some
+                              /root/GetSetMemberWithInlineKeyword.fs (2,11--2,17)
+                           WithKeyword =
+                            /root/GetSetMemberWithInlineKeyword.fs (3,8--3,12)
+                           GetKeyword =
+                            Some
+                              /root/GetSetMemberWithInlineKeyword.fs (3,20--3,23)
+                           AndKeyword =
+                            Some
+                              /root/GetSetMemberWithInlineKeyword.fs (4,8--4,11)
+                           SetKeyword =
+                            Some
+                              /root/GetSetMemberWithInlineKeyword.fs (4,19--4,22) })],
+                     /root/GetSetMemberWithInlineKeyword.fs (2,4--4,29)), [],
+                  None, /root/GetSetMemberWithInlineKeyword.fs (1,5--4,29),
+                  { LeadingKeyword =
+                     Type /root/GetSetMemberWithInlineKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/GetSetMemberWithInlineKeyword.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/GetSetMemberWithInlineKeyword.fs (1,0--4,29))],
+          PreXmlDocEmpty, [], None,
+          /root/GetSetMemberWithInlineKeyword.fs (1,0--4,29),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs b/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs
new file mode 100644
index 00000000000..348fdc3ad76
--- /dev/null
+++ b/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs
@@ -0,0 +1,3 @@
+namespace Ionide.VSCode.FSharp
+
+open global.Node
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs.bsl b/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs.bsl
new file mode 100644
index 00000000000..3d65f430cc3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs.bsl
@@ -0,0 +1,20 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/GlobalInOpenPathShouldContainTrivia.fs", false,
+      QualifiedNameOfFile GlobalInOpenPathShouldContainTrivia, [], [],
+      [SynModuleOrNamespace
+         ([Ionide; VSCode; FSharp], false, DeclaredNamespace,
+          [Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([`global`; Node],
+                    [/root/GlobalInOpenPathShouldContainTrivia.fs (3,11--3,12)],
+                    [Some (OriginalNotation "global"); None]),
+                 /root/GlobalInOpenPathShouldContainTrivia.fs (3,5--3,16)),
+              /root/GlobalInOpenPathShouldContainTrivia.fs (3,0--3,16))],
+          PreXmlDocEmpty, [], None,
+          /root/GlobalInOpenPathShouldContainTrivia.fs (1,0--3,16),
+          { LeadingKeyword =
+             Namespace /root/GlobalInOpenPathShouldContainTrivia.fs (1,0--1,9) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs b/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs
new file mode 100644
index 00000000000..f0de9aeb328
--- /dev/null
+++ b/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs
@@ -0,0 +1 @@
+global
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs.bsl b/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs.bsl
new file mode 100644
index 00000000000..ed2e6af2cea
--- /dev/null
+++ b/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs.bsl
@@ -0,0 +1,17 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/GlobalKeywordAsSynExpr.fs", false,
+      QualifiedNameOfFile GlobalKeywordAsSynExpr, [], [],
+      [SynModuleOrNamespace
+         ([GlobalKeywordAsSynExpr], false, AnonModule,
+          [Expr
+             (LongIdent
+                (false,
+                 SynLongIdent
+                   ([`global`], [], [Some (OriginalNotation "global")]), None,
+                 /root/GlobalKeywordAsSynExpr.fs (1,0--1,6)),
+              /root/GlobalKeywordAsSynExpr.fs (1,0--1,6))], PreXmlDocEmpty, [],
+          None, /root/GlobalKeywordAsSynExpr.fs (1,0--1,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs
new file mode 100644
index 00000000000..cbfb033f2c2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs
@@ -0,0 +1,5 @@
+// foo
+// bar
+namespace  global
+
+type X = int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
new file mode 100644
index 00000000000..30cff3e7bb0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
@@ -0,0 +1,41 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs", false,
+      QualifiedNameOfFile GlobalNamespaceShouldStartAtNamespaceKeyword, [], [],
+      [SynModuleOrNamespace
+         ([], false, GlobalNamespace,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,5--5,6)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok, LongIdent (SynLongIdent ([int], [], [None])),
+                        /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,9--5,12)),
+                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,9--5,12)),
+                  [], None,
+                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,5--5,12),
+                  { LeadingKeyword =
+                     Type
+                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,0--5,4)
+                    EqualsRange =
+                     Some
+                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,7--5,8)
+                    WithKeyword = None })],
+              /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,0--5,12))],
+          PreXmlDocEmpty, [], None,
+          /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (3,0--5,12),
+          { LeadingKeyword =
+             Namespace
+               /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (3,0--3,9) })],
+      (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (1,0--1,6);
+          LineComment
+            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (2,0--2,6)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi
new file mode 100644
index 00000000000..1a1ea1279f4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi
@@ -0,0 +1,5 @@
+// foo
+// bar
+namespace  global
+
+type Bar = | Bar of string * int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
new file mode 100644
index 00000000000..26bcc26b5a8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
@@ -0,0 +1,65 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi",
+      QualifiedNameOfFile GlobalNamespaceShouldStartAtNamespaceKeyword, [], [],
+      [SynModuleOrNamespaceSig
+         ([], false, GlobalNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Bar],
+                     PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,5--5,8)),
+                  Simple
+                    (Union
+                       (None,
+                        [SynUnionCase
+                           ([], SynIdent (Bar, None),
+                            Fields
+                              [SynField
+                                 ([], false, None,
+                                  LongIdent
+                                    (SynLongIdent ([string], [], [None])), false,
+                                  PreXmlDoc ((5,20), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,20--5,26),
+                                  { LeadingKeyword = None });
+                               SynField
+                                 ([], false, None,
+                                  LongIdent (SynLongIdent ([int], [], [None])),
+                                  false,
+                                  PreXmlDoc ((5,29), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,29--5,32),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((5,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,13--5,32),
+                            { BarRange =
+                               Some
+                                 /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,11--5,12) })],
+                        /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,11--5,32)),
+                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,11--5,32)),
+                  [],
+                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,5--5,32),
+                  { LeadingKeyword =
+                     Type
+                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,0--5,4)
+                    EqualsRange =
+                     Some
+                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,9--5,10)
+                    WithKeyword = None })],
+              /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,0--5,32))],
+          PreXmlDocEmpty, [], None,
+          /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (3,0--5,32),
+          { LeadingKeyword =
+             Namespace
+               /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (3,0--3,9) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (1,0--1,6);
+          LineComment
+            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (2,0--2,6)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs b/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs
new file mode 100644
index 00000000000..9264646b7c3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs
@@ -0,0 +1,3 @@
+if a
+then b
+else c
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs.bsl b/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs.bsl
new file mode 100644
index 00000000000..60e1e31b39c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs.bsl
@@ -0,0 +1,27 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/If,ThenAndElseKeywordOnSeparateLines.fs", false,
+      QualifiedNameOfFile If,ThenAndElseKeywordOnSeparateLines, [], [],
+      [SynModuleOrNamespace
+         ([If,ThenAndElseKeywordOnSeparateLines], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b, Some (Ident c),
+                 Yes /root/If,ThenAndElseKeywordOnSeparateLines.fs (1,0--2,4),
+                 false, /root/If,ThenAndElseKeywordOnSeparateLines.fs (1,0--3,6),
+                 { IfKeyword =
+                    /root/If,ThenAndElseKeywordOnSeparateLines.fs (1,0--1,2)
+                   IsElif = false
+                   ThenKeyword =
+                    /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--2,4)
+                   ElseKeyword =
+                    Some
+                      /root/If,ThenAndElseKeywordOnSeparateLines.fs (3,0--3,4)
+                   IfToThenRange =
+                    /root/If,ThenAndElseKeywordOnSeparateLines.fs (1,0--2,4) }),
+              /root/If,ThenAndElseKeywordOnSeparateLines.fs (1,0--3,6))],
+          PreXmlDocEmpty, [], None,
+          /root/If,ThenAndElseKeywordOnSeparateLines.fs (1,0--3,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs b/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs
new file mode 100644
index 00000000000..d6b90e2e736
--- /dev/null
+++ b/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs
@@ -0,0 +1 @@
+if a then b
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs.bsl
new file mode 100644
index 00000000000..3a787ec2ec4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs.bsl
@@ -0,0 +1,21 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/IfKeywordInIfThenElse.fs", false,
+      QualifiedNameOfFile IfKeywordInIfThenElse, [], [],
+      [SynModuleOrNamespace
+         ([IfKeywordInIfThenElse], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b, None,
+                 Yes /root/IfKeywordInIfThenElse.fs (1,0--1,9), false,
+                 /root/IfKeywordInIfThenElse.fs (1,0--1,11),
+                 { IfKeyword = /root/IfKeywordInIfThenElse.fs (1,0--1,2)
+                   IsElif = false
+                   ThenKeyword = /root/IfKeywordInIfThenElse.fs (1,5--1,9)
+                   ElseKeyword = None
+                   IfToThenRange = /root/IfKeywordInIfThenElse.fs (1,0--1,9) }),
+              /root/IfKeywordInIfThenElse.fs (1,0--1,11))], PreXmlDocEmpty, [],
+          None, /root/IfKeywordInIfThenElse.fs (1,0--1,11),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs b/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs
new file mode 100644
index 00000000000..3a4e16c0b69
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs
@@ -0,0 +1,7 @@
+type internal CompilerStateCache(readAllBytes: string -> byte[], projectOptions: FSharpProjectOptions)
+//#if !NO_TYPEPROVIDERS
+    as this =
+//#else
+//     =
+// #endif
+    class end
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs.bsl b/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs.bsl
new file mode 100644
index 00000000000..cb0a62f30ce
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs.bsl
@@ -0,0 +1,100 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ImplicitCtorWithAsKeyword.fs", false,
+      QualifiedNameOfFile ImplicitCtorWithAsKeyword, [], [],
+      [SynModuleOrNamespace
+         ([ImplicitCtorWithAsKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [CompilerStateCache],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false,
+                     Some
+                       (Internal /root/ImplicitCtorWithAsKeyword.fs (1,5--1,13)),
+                     /root/ImplicitCtorWithAsKeyword.fs (1,14--1,32)),
+                  ObjectModel
+                    (Class,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([Typed
+                               (Id
+                                  (readAllBytes, None, false, false, false,
+                                   /root/ImplicitCtorWithAsKeyword.fs (1,33--1,45)),
+                                Fun
+                                  (LongIdent
+                                     (SynLongIdent ([string], [], [None])),
+                                   Array
+                                     (1,
+                                      LongIdent
+                                        (SynLongIdent ([byte], [], [None])),
+                                      /root/ImplicitCtorWithAsKeyword.fs (1,57--1,63)),
+                                   /root/ImplicitCtorWithAsKeyword.fs (1,47--1,63),
+                                   { ArrowRange =
+                                      /root/ImplicitCtorWithAsKeyword.fs (1,54--1,56) }),
+                                /root/ImplicitCtorWithAsKeyword.fs (1,33--1,63));
+                             Typed
+                               (Id
+                                  (projectOptions, None, false, false, false,
+                                   /root/ImplicitCtorWithAsKeyword.fs (1,65--1,79)),
+                                LongIdent
+                                  (SynLongIdent
+                                     ([FSharpProjectOptions], [], [None])),
+                                /root/ImplicitCtorWithAsKeyword.fs (1,65--1,101))],
+                            /root/ImplicitCtorWithAsKeyword.fs (1,32--1,102)),
+                         Some this,
+                         PreXmlDoc ((1,32), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/ImplicitCtorWithAsKeyword.fs (1,14--1,32),
+                         { AsKeyword =
+                            Some /root/ImplicitCtorWithAsKeyword.fs (3,4--3,6) })],
+                     /root/ImplicitCtorWithAsKeyword.fs (7,4--7,13)), [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([Typed
+                              (Id
+                                 (readAllBytes, None, false, false, false,
+                                  /root/ImplicitCtorWithAsKeyword.fs (1,33--1,45)),
+                               Fun
+                                 (LongIdent
+                                    (SynLongIdent ([string], [], [None])),
+                                  Array
+                                    (1,
+                                     LongIdent
+                                       (SynLongIdent ([byte], [], [None])),
+                                     /root/ImplicitCtorWithAsKeyword.fs (1,57--1,63)),
+                                  /root/ImplicitCtorWithAsKeyword.fs (1,47--1,63),
+                                  { ArrowRange =
+                                     /root/ImplicitCtorWithAsKeyword.fs (1,54--1,56) }),
+                               /root/ImplicitCtorWithAsKeyword.fs (1,33--1,63));
+                            Typed
+                              (Id
+                                 (projectOptions, None, false, false, false,
+                                  /root/ImplicitCtorWithAsKeyword.fs (1,65--1,79)),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([FSharpProjectOptions], [], [None])),
+                               /root/ImplicitCtorWithAsKeyword.fs (1,65--1,101))],
+                           /root/ImplicitCtorWithAsKeyword.fs (1,32--1,102)),
+                        Some this,
+                        PreXmlDoc ((1,32), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/ImplicitCtorWithAsKeyword.fs (1,14--1,32),
+                        { AsKeyword =
+                           Some /root/ImplicitCtorWithAsKeyword.fs (3,4--3,6) })),
+                  /root/ImplicitCtorWithAsKeyword.fs (1,5--7,13),
+                  { LeadingKeyword =
+                     Type /root/ImplicitCtorWithAsKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/ImplicitCtorWithAsKeyword.fs (3,12--3,13)
+                    WithKeyword = None })],
+              /root/ImplicitCtorWithAsKeyword.fs (1,0--7,13))], PreXmlDocEmpty,
+          [], None, /root/ImplicitCtorWithAsKeyword.fs (1,0--7,13),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/ImplicitCtorWithAsKeyword.fs (2,0--2,23);
+          LineComment /root/ImplicitCtorWithAsKeyword.fs (4,0--4,7);
+          LineComment /root/ImplicitCtorWithAsKeyword.fs (5,0--5,8);
+          LineComment /root/ImplicitCtorWithAsKeyword.fs (6,0--6,9)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InHeadPattern.fs b/tests/service/data/SyntaxTree/InHeadPattern.fs
new file mode 100644
index 00000000000..912685faae4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/InHeadPattern.fs
@@ -0,0 +1 @@
+let 1 :: _ = [ 4; 5; 6 ]
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InHeadPattern.fs.bsl b/tests/service/data/SyntaxTree/InHeadPattern.fs.bsl
new file mode 100644
index 00000000000..9d06cb7cfe4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/InHeadPattern.fs.bsl
@@ -0,0 +1,39 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/InHeadPattern.fs", false, QualifiedNameOfFile InHeadPattern, [], [],
+      [SynModuleOrNamespace
+         ([InHeadPattern], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  ListCons
+                    (Const (Int32 1, /root/InHeadPattern.fs (1,4--1,5)),
+                     Wild /root/InHeadPattern.fs (1,9--1,10),
+                     /root/InHeadPattern.fs (1,4--1,10),
+                     { ColonColonRange = /root/InHeadPattern.fs (1,6--1,8) }),
+                  None,
+                  ArrayOrListComputed
+                    (false,
+                     Sequential
+                       (SuppressNeither, true,
+                        Const (Int32 4, /root/InHeadPattern.fs (1,15--1,16)),
+                        Sequential
+                          (SuppressNeither, true,
+                           Const (Int32 5, /root/InHeadPattern.fs (1,18--1,19)),
+                           Const (Int32 6, /root/InHeadPattern.fs (1,21--1,22)),
+                           /root/InHeadPattern.fs (1,18--1,22)),
+                        /root/InHeadPattern.fs (1,15--1,22)),
+                     /root/InHeadPattern.fs (1,13--1,24)),
+                  /root/InHeadPattern.fs (1,4--1,10),
+                  Yes /root/InHeadPattern.fs (1,0--1,24),
+                  { LeadingKeyword = Let /root/InHeadPattern.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange = Some /root/InHeadPattern.fs (1,11--1,12) })],
+              /root/InHeadPattern.fs (1,0--1,24))], PreXmlDocEmpty, [], None,
+          /root/InHeadPattern.fs (1,0--1,24), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/IncompleteLongIdent.fs b/tests/service/data/SyntaxTree/IncompleteLongIdent.fs
new file mode 100644
index 00000000000..a7a516155bb
--- /dev/null
+++ b/tests/service/data/SyntaxTree/IncompleteLongIdent.fs
@@ -0,0 +1,3 @@
+module Module
+
+A.
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/IncompleteLongIdent.fs.bsl b/tests/service/data/SyntaxTree/IncompleteLongIdent.fs.bsl
new file mode 100644
index 00000000000..8839906d344
--- /dev/null
+++ b/tests/service/data/SyntaxTree/IncompleteLongIdent.fs.bsl
@@ -0,0 +1,17 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/IncompleteLongIdent.fs", false, QualifiedNameOfFile Module, [], [],
+      [SynModuleOrNamespace
+         ([Module], false, NamedModule,
+          [Expr
+             (LongIdent
+                (false,
+                 SynLongIdent
+                   ([A], [/root/IncompleteLongIdent.fs (3,1--3,2)], [None]),
+                 None, /root/IncompleteLongIdent.fs (3,0--3,2)),
+              /root/IncompleteLongIdent.fs (3,0--3,2))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/IncompleteLongIdent.fs (1,0--3,2),
+          { LeadingKeyword = Module /root/IncompleteLongIdent.fs (1,0--1,6) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InfixOperation.fs b/tests/service/data/SyntaxTree/InfixOperation.fs
new file mode 100644
index 00000000000..1a5a117eb38
--- /dev/null
+++ b/tests/service/data/SyntaxTree/InfixOperation.fs
@@ -0,0 +1 @@
+1 + 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InfixOperation.fs.bsl b/tests/service/data/SyntaxTree/InfixOperation.fs.bsl
new file mode 100644
index 00000000000..1a398f2d0f2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/InfixOperation.fs.bsl
@@ -0,0 +1,24 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/InfixOperation.fs", false, QualifiedNameOfFile InfixOperation, [],
+      [],
+      [SynModuleOrNamespace
+         ([InfixOperation], false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false,
+                 App
+                   (NonAtomic, true,
+                    LongIdent
+                      (false,
+                       SynLongIdent
+                         ([op_Addition], [], [Some (OriginalNotation "+")]),
+                       None, /root/InfixOperation.fs (1,2--1,3)),
+                    Const (Int32 1, /root/InfixOperation.fs (1,0--1,1)),
+                    /root/InfixOperation.fs (1,0--1,3)),
+                 Const (Int32 1, /root/InfixOperation.fs (1,4--1,5)),
+                 /root/InfixOperation.fs (1,0--1,5)),
+              /root/InfixOperation.fs (1,0--1,5))], PreXmlDocEmpty, [], None,
+          /root/InfixOperation.fs (1,0--1,5), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs b/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
new file mode 100644
index 00000000000..9b50201463d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
@@ -0,0 +1 @@
+{ inherit Exception(msg); X = 1; }
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
new file mode 100644
index 00000000000..3fc30030af6
--- /dev/null
+++ b/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
@@ -0,0 +1,44 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs",
+      false,
+      QualifiedNameOfFile
+        InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField,
+      [], [],
+      [SynModuleOrNamespace
+         ([InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField],
+          false, AnonModule,
+          [Expr
+             (Record
+                (Some
+                   (LongIdent (SynLongIdent ([Exception], [], [None])),
+                    Paren
+                      (Ident msg,
+                       /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,19--1,20),
+                       Some
+                         /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,23--1,24),
+                       /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,19--1,24)),
+                    /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,10--1,24),
+                    Some
+                      (/root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,24--1,25),
+                       Some (1,25)),
+                    /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,2--1,9)),
+                 None,
+                 [SynExprRecordField
+                    ((SynLongIdent ([X], [], [None]), true),
+                     Some
+                       /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,28--1,29),
+                     Some
+                       (Const
+                          (Int32 1,
+                           /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,30--1,31))),
+                     Some
+                       (/root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,31--1,32),
+                        Some (1,32)))],
+                 /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--1,34)),
+              /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--1,34))],
+          PreXmlDocEmpty, [], None,
+          /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--1,34),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InlineKeyword.fsi b/tests/service/data/SyntaxTree/InlineKeyword.fsi
new file mode 100644
index 00000000000..477a4bc4072
--- /dev/null
+++ b/tests/service/data/SyntaxTree/InlineKeyword.fsi
@@ -0,0 +1,3 @@
+namespace X
+
+val inline meh: int -> int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InlineKeyword.fsi.bsl b/tests/service/data/SyntaxTree/InlineKeyword.fsi.bsl
new file mode 100644
index 00000000000..6f1bc276ec3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/InlineKeyword.fsi.bsl
@@ -0,0 +1,26 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/InlineKeyword.fsi", QualifiedNameOfFile InlineKeyword, [], [],
+      [SynModuleOrNamespaceSig
+         ([X], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (meh, None), SynValTyparDecls (None, true),
+                 Fun
+                   (LongIdent (SynLongIdent ([int], [], [None])),
+                    LongIdent (SynLongIdent ([int], [], [None])),
+                    /root/InlineKeyword.fsi (3,16--3,26),
+                    { ArrowRange = /root/InlineKeyword.fsi (3,20--3,22) }),
+                 SynValInfo
+                   ([[SynArgInfo ([], false, None)]],
+                    SynArgInfo ([], false, None)), true, false,
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None, /root/InlineKeyword.fsi (3,0--3,26),
+                 { LeadingKeyword = Val /root/InlineKeyword.fsi (3,0--3,3)
+                   InlineKeyword = Some /root/InlineKeyword.fsi (3,4--3,10)
+                   WithKeyword = None
+                   EqualsRange = None }), /root/InlineKeyword.fsi (3,0--3,26))],
+          PreXmlDocEmpty, [], None, /root/InlineKeyword.fsi (1,0--3,26),
+          { LeadingKeyword = Namespace /root/InlineKeyword.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs b/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs
new file mode 100644
index 00000000000..7d93bcd1208
--- /dev/null
+++ b/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs
@@ -0,0 +1,3 @@
+let inline x y z =
+    let inline a b c = ()
+    ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs.bsl b/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs.bsl
new file mode 100644
index 00000000000..a2f87847770
--- /dev/null
+++ b/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs.bsl
@@ -0,0 +1,73 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/InlineKeywordInBinding.fs", false,
+      QualifiedNameOfFile InlineKeywordInBinding, [], [],
+      [SynModuleOrNamespace
+         ([InlineKeywordInBinding], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, true, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some y)];
+                         [SynArgInfo ([], false, Some z)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([x], [], [None]), None, None,
+                     Pats
+                       [Named
+                          (SynIdent (y, None), false, None,
+                           /root/InlineKeywordInBinding.fs (1,13--1,14));
+                        Named
+                          (SynIdent (z, None), false, None,
+                           /root/InlineKeywordInBinding.fs (1,15--1,16))], None,
+                     /root/InlineKeywordInBinding.fs (1,11--1,16)), None,
+                  LetOrUse
+                    (false, false,
+                     [SynBinding
+                        (None, Normal, true, false, [],
+                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         SynValData
+                           (None,
+                            SynValInfo
+                              ([[SynArgInfo ([], false, Some b)];
+                                [SynArgInfo ([], false, Some c)]],
+                               SynArgInfo ([], false, None)), None),
+                         LongIdent
+                           (SynLongIdent ([a], [], [None]), None, None,
+                            Pats
+                              [Named
+                                 (SynIdent (b, None), false, None,
+                                  /root/InlineKeywordInBinding.fs (2,17--2,18));
+                               Named
+                                 (SynIdent (c, None), false, None,
+                                  /root/InlineKeywordInBinding.fs (2,19--2,20))],
+                            None, /root/InlineKeywordInBinding.fs (2,15--2,20)),
+                         None,
+                         Const
+                           (Unit, /root/InlineKeywordInBinding.fs (2,23--2,25)),
+                         /root/InlineKeywordInBinding.fs (2,15--2,20), NoneAtLet,
+                         { LeadingKeyword =
+                            Let /root/InlineKeywordInBinding.fs (2,4--2,7)
+                           InlineKeyword =
+                            Some /root/InlineKeywordInBinding.fs (2,8--2,14)
+                           EqualsRange =
+                            Some /root/InlineKeywordInBinding.fs (2,21--2,22) })],
+                     Const (Unit, /root/InlineKeywordInBinding.fs (3,4--3,6)),
+                     /root/InlineKeywordInBinding.fs (2,4--3,6),
+                     { InKeyword = None }),
+                  /root/InlineKeywordInBinding.fs (1,11--1,16), NoneAtLet,
+                  { LeadingKeyword =
+                     Let /root/InlineKeywordInBinding.fs (1,0--1,3)
+                    InlineKeyword =
+                     Some /root/InlineKeywordInBinding.fs (1,4--1,10)
+                    EqualsRange =
+                     Some /root/InlineKeywordInBinding.fs (1,17--1,18) })],
+              /root/InlineKeywordInBinding.fs (1,0--3,6))], PreXmlDocEmpty, [],
+          None, /root/InlineKeywordInBinding.fs (1,0--3,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs b/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs
new file mode 100644
index 00000000000..c351705c399
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs
@@ -0,0 +1 @@
+fun a (b, _) c -> x
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
new file mode 100644
index 00000000000..19060875455
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
@@ -0,0 +1,71 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs", false,
+      QualifiedNameOfFile LambdaWithTupleParameterWithWildCardGivesCorrectBody,
+      [], [],
+      [SynModuleOrNamespace
+         ([LambdaWithTupleParameterWithWildCardGivesCorrectBody], false,
+          AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (a, None, false, false, false,
+                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,4--1,5))],
+                    /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,4--1,5)),
+                 Lambda
+                   (false, true,
+                    SimplePats
+                      ([Id
+                          (b, None, false, false, false,
+                           /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,7--1,8));
+                        Id
+                          (_arg1, None, true, false, false,
+                           /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,10--1,11))],
+                       /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,6--1,12)),
+                    Lambda
+                      (false, true,
+                       SimplePats
+                         ([Id
+                             (c, None, false, false, false,
+                              /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,13--1,14))],
+                          /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,13--1,14)),
+                       Ident x, None,
+                       /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,0--1,19),
+                       { ArrowRange =
+                          Some
+                            /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,15--1,17) }),
+                    None,
+                    /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,0--1,19),
+                    { ArrowRange =
+                       Some
+                         /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,15--1,17) }),
+                 Some
+                   ([Named
+                       (SynIdent (a, None), false, None,
+                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,4--1,5));
+                     Paren
+                       (Tuple
+                          (false,
+                           [Named
+                              (SynIdent (b, None), false, None,
+                               /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,7--1,8));
+                            Wild
+                              /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,10--1,11)],
+                           /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,7--1,11)),
+                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,6--1,12));
+                     Named
+                       (SynIdent (c, None), false, None,
+                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,13--1,14))],
+                    Ident x),
+                 /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,0--1,19),
+                 { ArrowRange =
+                    Some
+                      /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,15--1,17) }),
+              /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,0--1,19))],
+          PreXmlDocEmpty, [], None,
+          /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,0--1,19),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs b/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs
new file mode 100644
index 00000000000..1570867ed82
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs
@@ -0,0 +1 @@
+fun a b -> x
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
new file mode 100644
index 00000000000..823c77c77ce
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
@@ -0,0 +1,44 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LambdaWithTwoParametersGivesCorrectBody.fs", false,
+      QualifiedNameOfFile LambdaWithTwoParametersGivesCorrectBody, [], [],
+      [SynModuleOrNamespace
+         ([LambdaWithTwoParametersGivesCorrectBody], false, AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (a, None, false, false, false,
+                        /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,4--1,5))],
+                    /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,4--1,5)),
+                 Lambda
+                   (false, true,
+                    SimplePats
+                      ([Id
+                          (b, None, false, false, false,
+                           /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,6--1,7))],
+                       /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,6--1,7)),
+                    Ident x, None,
+                    /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,0--1,12),
+                    { ArrowRange =
+                       Some
+                         /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,8--1,10) }),
+                 Some
+                   ([Named
+                       (SynIdent (a, None), false, None,
+                        /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,4--1,5));
+                     Named
+                       (SynIdent (b, None), false, None,
+                        /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,6--1,7))],
+                    Ident x),
+                 /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,0--1,12),
+                 { ArrowRange =
+                    Some
+                      /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,8--1,10) }),
+              /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,0--1,12))],
+          PreXmlDocEmpty, [], None,
+          /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,0--1,12),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs b/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs
new file mode 100644
index 00000000000..6d534022377
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs
@@ -0,0 +1 @@
+fun a _ b -> x
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
new file mode 100644
index 00000000000..f9751a7005e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
@@ -0,0 +1,58 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LambdaWithWildCardParameterGivesCorrectBody.fs", false,
+      QualifiedNameOfFile LambdaWithWildCardParameterGivesCorrectBody, [], [],
+      [SynModuleOrNamespace
+         ([LambdaWithWildCardParameterGivesCorrectBody], false, AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (a, None, false, false, false,
+                        /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,4--1,5))],
+                    /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,4--1,5)),
+                 Lambda
+                   (false, true,
+                    SimplePats
+                      ([Id
+                          (_arg1, None, true, false, false,
+                           /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,6--1,7))],
+                       /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,6--1,7)),
+                    Lambda
+                      (false, true,
+                       SimplePats
+                         ([Id
+                             (b, None, false, false, false,
+                              /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,8--1,9))],
+                          /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,8--1,9)),
+                       Ident x, None,
+                       /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,0--1,14),
+                       { ArrowRange =
+                          Some
+                            /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,10--1,12) }),
+                    None,
+                    /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,0--1,14),
+                    { ArrowRange =
+                       Some
+                         /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,10--1,12) }),
+                 Some
+                   ([Named
+                       (SynIdent (a, None), false, None,
+                        /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,4--1,5));
+                     Wild
+                       /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,6--1,7);
+                     Named
+                       (SynIdent (b, None), false, None,
+                        /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,8--1,9))],
+                    Ident x),
+                 /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,0--1,14),
+                 { ArrowRange =
+                    Some
+                      /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,10--1,12) }),
+              /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,0--1,14))],
+          PreXmlDocEmpty, [], None,
+          /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,0--1,14),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs b/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs
new file mode 100644
index 00000000000..3266a6b339e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs
@@ -0,0 +1 @@
+fun _ -> fun _ -> x
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
new file mode 100644
index 00000000000..5e4dd4e1a2a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
@@ -0,0 +1,61 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs", false,
+      QualifiedNameOfFile LambdaWithWildCardThatReturnsALambdaGivesCorrectBody,
+      [], [],
+      [SynModuleOrNamespace
+         ([LambdaWithWildCardThatReturnsALambdaGivesCorrectBody], false,
+          AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (_arg2, None, true, false, false,
+                        /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,4--1,5))],
+                    /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,4--1,5)),
+                 Lambda
+                   (false, false,
+                    SimplePats
+                      ([Id
+                          (_arg1, None, true, false, false,
+                           /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,13--1,14))],
+                       /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,13--1,14)),
+                    Ident x,
+                    Some
+                      ([Wild
+                          /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,13--1,14)],
+                       Ident x),
+                    /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,9--1,19),
+                    { ArrowRange =
+                       Some
+                         /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,15--1,17) }),
+                 Some
+                   ([Wild
+                       /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,4--1,5)],
+                    Lambda
+                      (false, false,
+                       SimplePats
+                         ([Id
+                             (_arg1, None, true, false, false,
+                              /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,13--1,14))],
+                          /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,13--1,14)),
+                       Ident x,
+                       Some
+                         ([Wild
+                             /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,13--1,14)],
+                          Ident x),
+                       /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,9--1,19),
+                       { ArrowRange =
+                          Some
+                            /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,15--1,17) })),
+                 /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,0--1,19),
+                 { ArrowRange =
+                    Some
+                      /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,6--1,8) }),
+              /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,0--1,19))],
+          PreXmlDocEmpty, [], None,
+          /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,0--1,19),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi b/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi
new file mode 100644
index 00000000000..a5f44b1cdc5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi
@@ -0,0 +1,2 @@
+type A = obj
+and B = int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi.bsl
new file mode 100644
index 00000000000..0057b3052b9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi.bsl
@@ -0,0 +1,46 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/LeadingKeywordInRecursiveTypes.fsi",
+      QualifiedNameOfFile LeadingKeywordInRecursiveTypes, [], [],
+      [SynModuleOrNamespaceSig
+         ([LeadingKeywordInRecursiveTypes], false, AnonModule,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [A],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/LeadingKeywordInRecursiveTypes.fsi (1,5--1,6)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok, LongIdent (SynLongIdent ([obj], [], [None])),
+                        /root/LeadingKeywordInRecursiveTypes.fsi (1,9--1,12)),
+                     /root/LeadingKeywordInRecursiveTypes.fsi (1,9--1,12)), [],
+                  /root/LeadingKeywordInRecursiveTypes.fsi (1,5--1,12),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeywordInRecursiveTypes.fsi (1,0--1,4)
+                    EqualsRange =
+                     Some /root/LeadingKeywordInRecursiveTypes.fsi (1,7--1,8)
+                    WithKeyword = None });
+               SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [B],
+                     PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/LeadingKeywordInRecursiveTypes.fsi (2,4--2,5)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok, LongIdent (SynLongIdent ([int], [], [None])),
+                        /root/LeadingKeywordInRecursiveTypes.fsi (2,8--2,11)),
+                     /root/LeadingKeywordInRecursiveTypes.fsi (2,8--2,11)), [],
+                  /root/LeadingKeywordInRecursiveTypes.fsi (2,4--2,11),
+                  { LeadingKeyword =
+                     And /root/LeadingKeywordInRecursiveTypes.fsi (2,0--2,3)
+                    EqualsRange =
+                     Some /root/LeadingKeywordInRecursiveTypes.fsi (2,6--2,7)
+                    WithKeyword = None })],
+              /root/LeadingKeywordInRecursiveTypes.fsi (1,0--2,11))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeywordInRecursiveTypes.fsi (1,0--2,11),
+          { LeadingKeyword = None })], { ConditionalDirectives = []
+                                         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LetKeyword.fs b/tests/service/data/SyntaxTree/LetKeyword.fs
new file mode 100644
index 00000000000..ce5c6d518b8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LetKeyword.fs
@@ -0,0 +1 @@
+let a b = b + 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LetKeyword.fs.bsl b/tests/service/data/SyntaxTree/LetKeyword.fs.bsl
new file mode 100644
index 00000000000..5b0b88f7e87
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LetKeyword.fs.bsl
@@ -0,0 +1,42 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LetKeyword.fs", false, QualifiedNameOfFile LetKeyword, [], [],
+      [SynModuleOrNamespace
+         ([LetKeyword], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some b)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([a], [], [None]), None, None,
+                     Pats
+                       [Named
+                          (SynIdent (b, None), false, None,
+                           /root/LetKeyword.fs (1,6--1,7))], None,
+                     /root/LetKeyword.fs (1,4--1,7)), None,
+                  App
+                    (NonAtomic, false,
+                     App
+                       (NonAtomic, true,
+                        LongIdent
+                          (false,
+                           SynLongIdent
+                             ([op_Addition], [], [Some (OriginalNotation "+")]),
+                           None, /root/LetKeyword.fs (1,12--1,13)), Ident b,
+                        /root/LetKeyword.fs (1,10--1,13)),
+                     Const (Int32 1, /root/LetKeyword.fs (1,14--1,15)),
+                     /root/LetKeyword.fs (1,10--1,15)),
+                  /root/LetKeyword.fs (1,4--1,7), NoneAtLet,
+                  { LeadingKeyword = Let /root/LetKeyword.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange = Some /root/LetKeyword.fs (1,8--1,9) })],
+              /root/LetKeyword.fs (1,0--1,15))], PreXmlDocEmpty, [], None,
+          /root/LetKeyword.fs (1,0--1,15), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LetRecKeyword.fs b/tests/service/data/SyntaxTree/LetRecKeyword.fs
new file mode 100644
index 00000000000..3f1377946ad
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LetRecKeyword.fs
@@ -0,0 +1 @@
+let rec a b = b + 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LetRecKeyword.fs.bsl
new file mode 100644
index 00000000000..246b6e90b97
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LetRecKeyword.fs.bsl
@@ -0,0 +1,45 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LetRecKeyword.fs", false, QualifiedNameOfFile LetRecKeyword, [], [],
+      [SynModuleOrNamespace
+         ([LetRecKeyword], false, AnonModule,
+          [Let
+             (true,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some b)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([a], [], [None]), None, None,
+                     Pats
+                       [Named
+                          (SynIdent (b, None), false, None,
+                           /root/LetRecKeyword.fs (1,10--1,11))], None,
+                     /root/LetRecKeyword.fs (1,8--1,11)), None,
+                  App
+                    (NonAtomic, false,
+                     App
+                       (NonAtomic, true,
+                        LongIdent
+                          (false,
+                           SynLongIdent
+                             ([op_Addition], [], [Some (OriginalNotation "+")]),
+                           None, /root/LetRecKeyword.fs (1,16--1,17)), Ident b,
+                        /root/LetRecKeyword.fs (1,14--1,17)),
+                     Const (Int32 1, /root/LetRecKeyword.fs (1,18--1,19)),
+                     /root/LetRecKeyword.fs (1,14--1,19)),
+                  /root/LetRecKeyword.fs (1,8--1,11), NoneAtLet,
+                  { LeadingKeyword =
+                     LetRec
+                       (/root/LetRecKeyword.fs (1,0--1,3),
+                        /root/LetRecKeyword.fs (1,4--1,7))
+                    InlineKeyword = None
+                    EqualsRange = Some /root/LetRecKeyword.fs (1,12--1,13) })],
+              /root/LetRecKeyword.fs (1,0--1,19))], PreXmlDocEmpty, [], None,
+          /root/LetRecKeyword.fs (1,0--1,19), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs b/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs
new file mode 100644
index 00000000000..297802ae240
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs
@@ -0,0 +1,2 @@
+let n = 1.0m<cm>
+let m = 7.000<cm>
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs.bsl b/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs.bsl
new file mode 100644
index 00000000000..62b0141c0ff
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs.bsl
@@ -0,0 +1,73 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MeasureContainsTheRangeOfTheConstant.fs", false,
+      QualifiedNameOfFile MeasureContainsTheRangeOfTheConstant, [], [],
+      [SynModuleOrNamespace
+         ([MeasureContainsTheRangeOfTheConstant], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (n, None), false, None,
+                     /root/MeasureContainsTheRangeOfTheConstant.fs (1,4--1,5)),
+                  None,
+                  Const
+                    (Measure
+                       (Decimal 1.0M,
+                        /root/MeasureContainsTheRangeOfTheConstant.fs (1,8--1,12),
+                        Seq
+                          ([Named
+                              ([cm],
+                               /root/MeasureContainsTheRangeOfTheConstant.fs (1,13--1,15))],
+                           /root/MeasureContainsTheRangeOfTheConstant.fs (1,13--1,15))),
+                     /root/MeasureContainsTheRangeOfTheConstant.fs (1,8--1,16)),
+                  /root/MeasureContainsTheRangeOfTheConstant.fs (1,4--1,5),
+                  Yes /root/MeasureContainsTheRangeOfTheConstant.fs (1,0--1,16),
+                  { LeadingKeyword =
+                     Let
+                       /root/MeasureContainsTheRangeOfTheConstant.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/MeasureContainsTheRangeOfTheConstant.fs (1,6--1,7) })],
+              /root/MeasureContainsTheRangeOfTheConstant.fs (1,0--1,16));
+           Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (m, None), false, None,
+                     /root/MeasureContainsTheRangeOfTheConstant.fs (2,4--2,5)),
+                  None,
+                  Const
+                    (Measure
+                       (Double 7.0,
+                        /root/MeasureContainsTheRangeOfTheConstant.fs (2,8--2,13),
+                        Seq
+                          ([Named
+                              ([cm],
+                               /root/MeasureContainsTheRangeOfTheConstant.fs (2,14--2,16))],
+                           /root/MeasureContainsTheRangeOfTheConstant.fs (2,14--2,16))),
+                     /root/MeasureContainsTheRangeOfTheConstant.fs (2,8--2,17)),
+                  /root/MeasureContainsTheRangeOfTheConstant.fs (2,4--2,5),
+                  Yes /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,17),
+                  { LeadingKeyword =
+                     Let
+                       /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/MeasureContainsTheRangeOfTheConstant.fs (2,6--2,7) })],
+              /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,17))],
+          PreXmlDocEmpty, [], None,
+          /root/MeasureContainsTheRangeOfTheConstant.fs (1,0--2,17),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberKeyword.fs b/tests/service/data/SyntaxTree/MemberKeyword.fs
new file mode 100644
index 00000000000..c1ea18e0255
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MemberKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    member this.Y ()  = ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberKeyword.fs.bsl
new file mode 100644
index 00000000000..5e02d22f3e9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MemberKeyword.fs.bsl
@@ -0,0 +1,56 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MemberKeyword.fs", false, QualifiedNameOfFile MemberKeyword, [], [],
+      [SynModuleOrNamespace
+         ([MemberKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/MemberKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([this; Y],
+                                  [/root/MemberKeyword.fs (2,15--2,16)],
+                                  [None; None]), None, None,
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/MemberKeyword.fs (2,18--2,20)),
+                                     /root/MemberKeyword.fs (2,18--2,20))], None,
+                               /root/MemberKeyword.fs (2,11--2,20)), None,
+                            Const (Unit, /root/MemberKeyword.fs (2,24--2,26)),
+                            /root/MemberKeyword.fs (2,11--2,20), NoneAtInvisible,
+                            { LeadingKeyword =
+                               Member /root/MemberKeyword.fs (2,4--2,10)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some /root/MemberKeyword.fs (2,22--2,23) }),
+                         /root/MemberKeyword.fs (2,4--2,26))],
+                     /root/MemberKeyword.fs (2,4--2,26)), [], None,
+                  /root/MemberKeyword.fs (1,5--2,26),
+                  { LeadingKeyword = Type /root/MemberKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/MemberKeyword.fs (1,7--1,8)
+                    WithKeyword = None })], /root/MemberKeyword.fs (1,0--2,26))],
+          PreXmlDocEmpty, [], None, /root/MemberKeyword.fs (1,0--2,26),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi b/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi
new file mode 100644
index 00000000000..09bdee493eb
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi
@@ -0,0 +1,4 @@
+namespace X
+
+type Foo =
+    abstract member Bar : int with get,set
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
new file mode 100644
index 00000000000..4ca021be4bd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
@@ -0,0 +1,66 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi",
+      QualifiedNameOfFile
+        MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([X], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (3,5--3,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynValSig
+                           ([], SynIdent (Bar, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,4--4,42),
+                            { LeadingKeyword =
+                               AbstractMember
+                                 (/root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,4--4,12),
+                                  /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,13--4,19))
+                              InlineKeyword = None
+                              WithKeyword =
+                               Some
+                                 /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,30--4,34)
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGetSet },
+                         /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,4--4,42),
+                         { GetSetKeywords =
+                            Some
+                              (GetSet
+                                 (/root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,35--4,38),
+                                  /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,39--4,42))) })],
+                     /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,4--4,42)),
+                  [],
+                  /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (3,5--4,42),
+                  { LeadingKeyword =
+                     Type
+                       /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some
+                       /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (3,9--3,10)
+                    WithKeyword = None })],
+              /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--4,42))],
+          PreXmlDocEmpty, [], None,
+          /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (1,0--4,42),
+          { LeadingKeyword =
+             Namespace
+               /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberValKeyword.fs b/tests/service/data/SyntaxTree/MemberValKeyword.fs
new file mode 100644
index 00000000000..430c5129838
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MemberValKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    member val Y : int = 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberValKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberValKeyword.fs.bsl
new file mode 100644
index 00000000000..feb712df7c2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MemberValKeyword.fs.bsl
@@ -0,0 +1,50 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MemberValKeyword.fs", false, QualifiedNameOfFile MemberValKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([MemberValKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/MemberValKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [AutoProperty
+                        ([], false, Y,
+                         Some (LongIdent (SynLongIdent ([int], [], [None]))),
+                         Member, { IsInstance = true
+                                   IsDispatchSlot = false
+                                   IsOverrideOrExplicitImpl = false
+                                   IsFinal = false
+                                   GetterOrSetterIsCompilerGenerated = false
+                                   MemberKind = Member },
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertySet },
+                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None,
+                         Const (Int32 1, /root/MemberValKeyword.fs (2,25--2,26)),
+                         /root/MemberValKeyword.fs (2,4--2,26),
+                         { LeadingKeyword =
+                            MemberVal
+                              (/root/MemberValKeyword.fs (2,4--2,10),
+                               /root/MemberValKeyword.fs (2,11--2,14))
+                           WithKeyword = None
+                           EqualsRange =
+                            Some /root/MemberValKeyword.fs (2,23--2,24)
+                           GetSetKeywords = None })],
+                     /root/MemberValKeyword.fs (2,4--2,26)), [], None,
+                  /root/MemberValKeyword.fs (1,5--2,26),
+                  { LeadingKeyword = Type /root/MemberValKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/MemberValKeyword.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/MemberValKeyword.fs (1,0--2,26))], PreXmlDocEmpty, [], None,
+          /root/MemberValKeyword.fs (1,0--2,26), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs b/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs
new file mode 100644
index 00000000000..57849183b07
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    member inline x.Y () = ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs.bsl
new file mode 100644
index 00000000000..0c41384c041
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs.bsl
@@ -0,0 +1,69 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MemberWithInlineKeyword.fs", false,
+      QualifiedNameOfFile MemberWithInlineKeyword, [], [],
+      [SynModuleOrNamespace
+         ([MemberWithInlineKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/MemberWithInlineKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynBinding
+                           (None, Normal, true, false, [],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([x; Y],
+                                  [/root/MemberWithInlineKeyword.fs (2,19--2,20)],
+                                  [None; None]), None, None,
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/MemberWithInlineKeyword.fs (2,22--2,24)),
+                                     /root/MemberWithInlineKeyword.fs (2,22--2,24))],
+                               None,
+                               /root/MemberWithInlineKeyword.fs (2,18--2,24)),
+                            None,
+                            Const
+                              (Unit,
+                               /root/MemberWithInlineKeyword.fs (2,27--2,29)),
+                            /root/MemberWithInlineKeyword.fs (2,18--2,24),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Member
+                                 /root/MemberWithInlineKeyword.fs (2,4--2,10)
+                              InlineKeyword =
+                               Some
+                                 /root/MemberWithInlineKeyword.fs (2,11--2,17)
+                              EqualsRange =
+                               Some
+                                 /root/MemberWithInlineKeyword.fs (2,25--2,26) }),
+                         /root/MemberWithInlineKeyword.fs (2,4--2,29))],
+                     /root/MemberWithInlineKeyword.fs (2,4--2,29)), [], None,
+                  /root/MemberWithInlineKeyword.fs (1,5--2,29),
+                  { LeadingKeyword =
+                     Type /root/MemberWithInlineKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/MemberWithInlineKeyword.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/MemberWithInlineKeyword.fs (1,0--2,29))], PreXmlDocEmpty, [],
+          None, /root/MemberWithInlineKeyword.fs (1,0--2,29),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs
new file mode 100644
index 00000000000..1bdecebd85a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs
@@ -0,0 +1,4 @@
+[<  Foo  >]
+module Bar
+
+let s : string = "s"
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs.bsl b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
new file mode 100644
index 00000000000..470bcc080ef
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
@@ -0,0 +1,60 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ModuleRangeShouldStartAtFirstAttribute.fs", false,
+      QualifiedNameOfFile Bar, [], [],
+      [SynModuleOrNamespace
+         ([Bar], false, NamedModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (s, None), false, None,
+                     /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,4--4,5)),
+                  Some
+                    (SynBindingReturnInfo
+                       (LongIdent (SynLongIdent ([string], [], [None])),
+                        /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,8--4,14),
+                        [],
+                        { ColonRange =
+                           Some
+                             /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,6--4,7) })),
+                  Typed
+                    (Const
+                       (String
+                          ("s", Regular,
+                           /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,17--4,20)),
+                        /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,17--4,20)),
+                     LongIdent (SynLongIdent ([string], [], [None])),
+                     /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,17--4,20)),
+                  /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,4--4,5),
+                  Yes
+                    /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,0--4,20),
+                  { LeadingKeyword =
+                     Let
+                       /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,0--4,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,15--4,16) })],
+              /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,0--4,20))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+          [{ Attributes =
+              [{ TypeName = SynLongIdent ([Foo], [], [None])
+                 ArgExpr =
+                  Const
+                    (Unit,
+                     /root/ModuleRangeShouldStartAtFirstAttribute.fs (1,4--1,7))
+                 Target = None
+                 AppliesToGetterAndSetter = false
+                 Range =
+                  /root/ModuleRangeShouldStartAtFirstAttribute.fs (1,4--1,7) }]
+             Range = /root/ModuleRangeShouldStartAtFirstAttribute.fs (1,0--1,11) }],
+          None, /root/ModuleRangeShouldStartAtFirstAttribute.fs (1,0--4,20),
+          { LeadingKeyword =
+             Module /root/ModuleRangeShouldStartAtFirstAttribute.fs (2,0--2,6) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi
new file mode 100644
index 00000000000..3eec4a8556c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi
@@ -0,0 +1,4 @@
+[<  Foo  >]
+module Bar
+
+val s : string
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
new file mode 100644
index 00000000000..9658e48216e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
@@ -0,0 +1,39 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/ModuleRangeShouldStartAtFirstAttribute.fsi",
+      QualifiedNameOfFile Bar, [], [],
+      [SynModuleOrNamespaceSig
+         ([Bar], false, NamedModule,
+          [Val
+             (SynValSig
+                ([], SynIdent (s, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([string], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None,
+                 /root/ModuleRangeShouldStartAtFirstAttribute.fsi (4,0--4,14),
+                 { LeadingKeyword =
+                    Val
+                      /root/ModuleRangeShouldStartAtFirstAttribute.fsi (4,0--4,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange = None }),
+              /root/ModuleRangeShouldStartAtFirstAttribute.fsi (4,0--4,14))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+          [{ Attributes =
+              [{ TypeName = SynLongIdent ([Foo], [], [None])
+                 ArgExpr =
+                  Const
+                    (Unit,
+                     /root/ModuleRangeShouldStartAtFirstAttribute.fsi (1,4--1,7))
+                 Target = None
+                 AppliesToGetterAndSetter = false
+                 Range =
+                  /root/ModuleRangeShouldStartAtFirstAttribute.fsi (1,4--1,7) }]
+             Range =
+              /root/ModuleRangeShouldStartAtFirstAttribute.fsi (1,0--1,11) }],
+          None, /root/ModuleRangeShouldStartAtFirstAttribute.fsi (1,0--4,14),
+          { LeadingKeyword =
+             Module /root/ModuleRangeShouldStartAtFirstAttribute.fsi (2,0--2,6) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs
new file mode 100644
index 00000000000..51d9bc2a74d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs
@@ -0,0 +1,12 @@
+/// this file contains patches to the F# Compiler Service that have not yet made it into
+/// published nuget packages.  We source-copy them here to have a consistent location for our to-be-removed extensions
+
+module FsAutoComplete.FCSPatches
+
+open FSharp.Compiler.Syntax
+open FSharp.Compiler.Text
+open FsAutoComplete.UntypedAstUtils
+open FSharp.Compiler.CodeAnalysis
+
+module internal SynExprAppLocationsImpl =
+let a = 42
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs.bsl
new file mode 100644
index 00000000000..fc9cf13ea89
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs.bsl
@@ -0,0 +1,86 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ModuleShouldContainModuleKeyword.fs", false,
+      QualifiedNameOfFile FsAutoComplete.FCSPatches, [], [],
+      [SynModuleOrNamespace
+         ([FsAutoComplete; FCSPatches], false, NamedModule,
+          [Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([FSharp; Compiler; Syntax],
+                    [/root/ModuleShouldContainModuleKeyword.fs (6,11--6,12);
+                     /root/ModuleShouldContainModuleKeyword.fs (6,20--6,21)],
+                    [None; None; None]),
+                 /root/ModuleShouldContainModuleKeyword.fs (6,5--6,27)),
+              /root/ModuleShouldContainModuleKeyword.fs (6,0--6,27));
+           Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([FSharp; Compiler; Text],
+                    [/root/ModuleShouldContainModuleKeyword.fs (7,11--7,12);
+                     /root/ModuleShouldContainModuleKeyword.fs (7,20--7,21)],
+                    [None; None; None]),
+                 /root/ModuleShouldContainModuleKeyword.fs (7,5--7,25)),
+              /root/ModuleShouldContainModuleKeyword.fs (7,0--7,25));
+           Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([FsAutoComplete; UntypedAstUtils],
+                    [/root/ModuleShouldContainModuleKeyword.fs (8,19--8,20)],
+                    [None; None]),
+                 /root/ModuleShouldContainModuleKeyword.fs (8,5--8,35)),
+              /root/ModuleShouldContainModuleKeyword.fs (8,0--8,35));
+           Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([FSharp; Compiler; CodeAnalysis],
+                    [/root/ModuleShouldContainModuleKeyword.fs (9,11--9,12);
+                     /root/ModuleShouldContainModuleKeyword.fs (9,20--9,21)],
+                    [None; None; None]),
+                 /root/ModuleShouldContainModuleKeyword.fs (9,5--9,33)),
+              /root/ModuleShouldContainModuleKeyword.fs (9,0--9,33));
+           NestedModule
+             (SynComponentInfo
+                ([], None, [], [SynExprAppLocationsImpl],
+                 PreXmlDoc ((11,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 Some
+                   (Internal
+                      /root/ModuleShouldContainModuleKeyword.fs (11,7--11,15)),
+                 /root/ModuleShouldContainModuleKeyword.fs (11,0--11,39)), false,
+              [Let
+                 (false,
+                  [SynBinding
+                     (None, Normal, false, false, [],
+                      PreXmlDoc ((12,0), FSharp.Compiler.Xml.XmlDocCollector),
+                      SynValData
+                        (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                         None),
+                      Named
+                        (SynIdent (a, None), false, None,
+                         /root/ModuleShouldContainModuleKeyword.fs (12,4--12,5)),
+                      None,
+                      Const
+                        (Int32 42,
+                         /root/ModuleShouldContainModuleKeyword.fs (12,8--12,10)),
+                      /root/ModuleShouldContainModuleKeyword.fs (12,4--12,5),
+                      Yes
+                        /root/ModuleShouldContainModuleKeyword.fs (12,0--12,10),
+                      { LeadingKeyword =
+                         Let
+                           /root/ModuleShouldContainModuleKeyword.fs (12,0--12,3)
+                        InlineKeyword = None
+                        EqualsRange =
+                         Some
+                           /root/ModuleShouldContainModuleKeyword.fs (12,6--12,7) })],
+                  /root/ModuleShouldContainModuleKeyword.fs (12,0--12,10))],
+              false, /root/ModuleShouldContainModuleKeyword.fs (11,0--12,10),
+              { ModuleKeyword =
+                 Some /root/ModuleShouldContainModuleKeyword.fs (11,0--11,6)
+                EqualsRange =
+                 Some /root/ModuleShouldContainModuleKeyword.fs (11,40--11,41) })],
+          PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/ModuleShouldContainModuleKeyword.fs (1,0--12,10),
+          { LeadingKeyword =
+             Module /root/ModuleShouldContainModuleKeyword.fs (4,0--4,6) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi
new file mode 100644
index 00000000000..b3753fdadd4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi
@@ -0,0 +1,3 @@
+module Bar
+
+val a: int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi.bsl
new file mode 100644
index 00000000000..99f21cbee02
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi.bsl
@@ -0,0 +1,25 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/ModuleShouldContainModuleKeyword.fsi", QualifiedNameOfFile Bar, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([Bar], false, NamedModule,
+          [Val
+             (SynValSig
+                ([], SynIdent (a, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None, /root/ModuleShouldContainModuleKeyword.fsi (3,0--3,10),
+                 { LeadingKeyword =
+                    Val /root/ModuleShouldContainModuleKeyword.fsi (3,0--3,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange = None }),
+              /root/ModuleShouldContainModuleKeyword.fsi (3,0--3,10))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/ModuleShouldContainModuleKeyword.fsi (1,0--3,10),
+          { LeadingKeyword =
+             Module /root/ModuleShouldContainModuleKeyword.fsi (1,0--1,6) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs
new file mode 100644
index 00000000000..dce7be4dddd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs
@@ -0,0 +1,3 @@
+fun x y z
+                            ->
+                                x * y * z
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs.bsl
new file mode 100644
index 00000000000..c6aaf24c6b2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs.bsl
@@ -0,0 +1,108 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MultilineLambdaHasArrowRange.fs", false,
+      QualifiedNameOfFile MultilineLambdaHasArrowRange, [], [],
+      [SynModuleOrNamespace
+         ([MultilineLambdaHasArrowRange], false, AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (x, None, false, false, false,
+                        /root/MultilineLambdaHasArrowRange.fs (1,4--1,5))],
+                    /root/MultilineLambdaHasArrowRange.fs (1,4--1,5)),
+                 Lambda
+                   (false, true,
+                    SimplePats
+                      ([Id
+                          (y, None, false, false, false,
+                           /root/MultilineLambdaHasArrowRange.fs (1,6--1,7))],
+                       /root/MultilineLambdaHasArrowRange.fs (1,6--1,7)),
+                    Lambda
+                      (false, true,
+                       SimplePats
+                         ([Id
+                             (z, None, false, false, false,
+                              /root/MultilineLambdaHasArrowRange.fs (1,8--1,9))],
+                          /root/MultilineLambdaHasArrowRange.fs (1,8--1,9)),
+                       App
+                         (NonAtomic, false,
+                          App
+                            (NonAtomic, true,
+                             LongIdent
+                               (false,
+                                SynLongIdent
+                                  ([op_Multiply], [],
+                                   [Some (OriginalNotation "*")]), None,
+                                /root/MultilineLambdaHasArrowRange.fs (3,38--3,39)),
+                             App
+                               (NonAtomic, false,
+                                App
+                                  (NonAtomic, true,
+                                   LongIdent
+                                     (false,
+                                      SynLongIdent
+                                        ([op_Multiply], [],
+                                         [Some (OriginalNotation "*")]), None,
+                                      /root/MultilineLambdaHasArrowRange.fs (3,34--3,35)),
+                                   Ident x,
+                                   /root/MultilineLambdaHasArrowRange.fs (3,32--3,35)),
+                                Ident y,
+                                /root/MultilineLambdaHasArrowRange.fs (3,32--3,37)),
+                             /root/MultilineLambdaHasArrowRange.fs (3,32--3,39)),
+                          Ident z,
+                          /root/MultilineLambdaHasArrowRange.fs (3,32--3,41)),
+                       None, /root/MultilineLambdaHasArrowRange.fs (1,0--3,41),
+                       { ArrowRange =
+                          Some
+                            /root/MultilineLambdaHasArrowRange.fs (2,28--2,30) }),
+                    None, /root/MultilineLambdaHasArrowRange.fs (1,0--3,41),
+                    { ArrowRange =
+                       Some /root/MultilineLambdaHasArrowRange.fs (2,28--2,30) }),
+                 Some
+                   ([Named
+                       (SynIdent (x, None), false, None,
+                        /root/MultilineLambdaHasArrowRange.fs (1,4--1,5));
+                     Named
+                       (SynIdent (y, None), false, None,
+                        /root/MultilineLambdaHasArrowRange.fs (1,6--1,7));
+                     Named
+                       (SynIdent (z, None), false, None,
+                        /root/MultilineLambdaHasArrowRange.fs (1,8--1,9))],
+                    App
+                      (NonAtomic, false,
+                       App
+                         (NonAtomic, true,
+                          LongIdent
+                            (false,
+                             SynLongIdent
+                               ([op_Multiply], [], [Some (OriginalNotation "*")]),
+                             None,
+                             /root/MultilineLambdaHasArrowRange.fs (3,38--3,39)),
+                          App
+                            (NonAtomic, false,
+                             App
+                               (NonAtomic, true,
+                                LongIdent
+                                  (false,
+                                   SynLongIdent
+                                     ([op_Multiply], [],
+                                      [Some (OriginalNotation "*")]), None,
+                                   /root/MultilineLambdaHasArrowRange.fs (3,34--3,35)),
+                                Ident x,
+                                /root/MultilineLambdaHasArrowRange.fs (3,32--3,35)),
+                             Ident y,
+                             /root/MultilineLambdaHasArrowRange.fs (3,32--3,37)),
+                          /root/MultilineLambdaHasArrowRange.fs (3,32--3,39)),
+                       Ident z,
+                       /root/MultilineLambdaHasArrowRange.fs (3,32--3,41))),
+                 /root/MultilineLambdaHasArrowRange.fs (1,0--3,41),
+                 { ArrowRange =
+                    Some /root/MultilineLambdaHasArrowRange.fs (2,28--2,30) }),
+              /root/MultilineLambdaHasArrowRange.fs (1,0--3,41))],
+          PreXmlDocEmpty, [], None,
+          /root/MultilineLambdaHasArrowRange.fs (1,0--3,41),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs b/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs
new file mode 100644
index 00000000000..d700c936366
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs
@@ -0,0 +1,8 @@
+namespace TypeEquality
+
+/// A type for witnessing type equality between 'a and 'b
+type Teq = class end
+
+namespace Foobar
+
+let x = 42
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
new file mode 100644
index 00000000000..ec72c97bdc3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
@@ -0,0 +1,68 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([TypeEquality], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Teq],
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,5--4,8)),
+                  ObjectModel
+                    (Class, [],
+                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,11--4,20)),
+                  [], None,
+                  /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (3,0--4,20),
+                  { LeadingKeyword =
+                     Type
+                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,0--4,4)
+                    EqualsRange =
+                     Some
+                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,9--4,10)
+                    WithKeyword = None })],
+              /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (3,0--4,20))],
+          PreXmlDocEmpty, [], None,
+          /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (1,0--4,20),
+          { LeadingKeyword =
+             Namespace
+               /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (1,0--1,9) });
+       SynModuleOrNamespace
+         ([Foobar], false, DeclaredNamespace,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((8,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (x, None), false, None,
+                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,4--8,5)),
+                  None,
+                  Const
+                    (Int32 42,
+                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,8--8,10)),
+                  /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,4--8,5),
+                  Yes
+                    /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,0--8,10),
+                  { LeadingKeyword =
+                     Let
+                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,0--8,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,6--8,7) })],
+              /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,0--8,10))],
+          PreXmlDocEmpty, [], None,
+          /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (6,0--8,10),
+          { LeadingKeyword =
+             Namespace
+               /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (6,0--6,9) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs b/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs
new file mode 100644
index 00000000000..c5690210106
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs
@@ -0,0 +1,3 @@
+type Foo =
+    | One =  0x00000001
+    | Two = 2
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl b/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
new file mode 100644
index 00000000000..fbd9a69a84b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
@@ -0,0 +1,56 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MultipleSynEnumCaseContainsRangeOfConstant.fs", false,
+      QualifiedNameOfFile MultipleSynEnumCaseContainsRangeOfConstant, [], [],
+      [SynModuleOrNamespace
+         ([MultipleSynEnumCaseContainsRangeOfConstant], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (1,5--1,8)),
+                  Simple
+                    (Enum
+                       ([SynEnumCase
+                           ([], SynIdent (One, None),
+                            Const
+                              (Int32 1,
+                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,13--2,23)),
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,6--2,23),
+                            { BarRange =
+                               Some
+                                 /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,4--2,5)
+                              EqualsRange =
+                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,10--2,11) });
+                         SynEnumCase
+                           ([], SynIdent (Two, None),
+                            Const
+                              (Int32 2,
+                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,12--3,13)),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,6--3,13),
+                            { BarRange =
+                               Some
+                                 /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,4--3,5)
+                              EqualsRange =
+                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,10--3,11) })],
+                        /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,4--3,13)),
+                     /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,4--3,13)),
+                  [], None,
+                  /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (1,5--3,13),
+                  { LeadingKeyword =
+                     Type
+                       /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (1,0--3,13))],
+          PreXmlDocEmpty, [], None,
+          /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (1,0--3,13),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs b/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs
new file mode 100644
index 00000000000..fa68fa2b2a7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs
@@ -0,0 +1,3 @@
+type Foo =
+    | Bar = 1
+    | Bear = 2
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs.bsl b/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs.bsl
new file mode 100644
index 00000000000..b404830b689
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs.bsl
@@ -0,0 +1,53 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MultipleSynEnumCasesHaveBarRange.fs", false,
+      QualifiedNameOfFile MultipleSynEnumCasesHaveBarRange, [], [],
+      [SynModuleOrNamespace
+         ([MultipleSynEnumCasesHaveBarRange], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/MultipleSynEnumCasesHaveBarRange.fs (1,5--1,8)),
+                  Simple
+                    (Enum
+                       ([SynEnumCase
+                           ([], SynIdent (Bar, None),
+                            Const
+                              (Int32 1,
+                               /root/MultipleSynEnumCasesHaveBarRange.fs (2,12--2,13)),
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/MultipleSynEnumCasesHaveBarRange.fs (2,6--2,13),
+                            { BarRange =
+                               Some
+                                 /root/MultipleSynEnumCasesHaveBarRange.fs (2,4--2,5)
+                              EqualsRange =
+                               /root/MultipleSynEnumCasesHaveBarRange.fs (2,10--2,11) });
+                         SynEnumCase
+                           ([], SynIdent (Bear, None),
+                            Const
+                              (Int32 2,
+                               /root/MultipleSynEnumCasesHaveBarRange.fs (3,13--3,14)),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/MultipleSynEnumCasesHaveBarRange.fs (3,6--3,14),
+                            { BarRange =
+                               Some
+                                 /root/MultipleSynEnumCasesHaveBarRange.fs (3,4--3,5)
+                              EqualsRange =
+                               /root/MultipleSynEnumCasesHaveBarRange.fs (3,11--3,12) })],
+                        /root/MultipleSynEnumCasesHaveBarRange.fs (2,4--3,14)),
+                     /root/MultipleSynEnumCasesHaveBarRange.fs (2,4--3,14)), [],
+                  None, /root/MultipleSynEnumCasesHaveBarRange.fs (1,5--3,14),
+                  { LeadingKeyword =
+                     Type /root/MultipleSynEnumCasesHaveBarRange.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/MultipleSynEnumCasesHaveBarRange.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/MultipleSynEnumCasesHaveBarRange.fs (1,0--3,14))],
+          PreXmlDocEmpty, [], None,
+          /root/MultipleSynEnumCasesHaveBarRange.fs (1,0--3,14),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs b/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs
new file mode 100644
index 00000000000..20561af436c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs
@@ -0,0 +1,6 @@
+async {
+    let! bar = getBar ()
+    and! foo = getFoo () in
+    and! meh = getMeh ()
+    return bar
+}
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs.bsl
new file mode 100644
index 00000000000..d57a3486ac6
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs.bsl
@@ -0,0 +1,79 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs",
+      false,
+      QualifiedNameOfFile
+        MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression,
+      [], [],
+      [SynModuleOrNamespace
+         ([MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression],
+          false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false, Ident async,
+                 ComputationExpr
+                   (false,
+                    LetOrUseBang
+                      (Yes
+                         /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,4--2,24),
+                       false, true,
+                       Named
+                         (SynIdent (bar, None), false, None,
+                          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,9--2,12)),
+                       App
+                         (NonAtomic, false, Ident getBar,
+                          Const
+                            (Unit,
+                             /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,22--2,24)),
+                          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,15--2,24)),
+                       [SynExprAndBang
+                          (Yes
+                             /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,4--3,27),
+                           false, true,
+                           Named
+                             (SynIdent (foo, None), false, None,
+                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,9--3,12)),
+                           App
+                             (NonAtomic, false, Ident getFoo,
+                              Const
+                                (Unit,
+                                 /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,22--3,24)),
+                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,15--3,24)),
+                           /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,4--3,24),
+                           { EqualsRange =
+                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,13--3,14)
+                             InKeyword =
+                              Some
+                                /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,25--3,27) });
+                        SynExprAndBang
+                          (Yes
+                             /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,4--5,10),
+                           false, true,
+                           Named
+                             (SynIdent (meh, None), false, None,
+                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,9--4,12)),
+                           App
+                             (NonAtomic, false, Ident getMeh,
+                              Const
+                                (Unit,
+                                 /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,22--4,24)),
+                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,15--4,24)),
+                           /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,4--4,24),
+                           { EqualsRange =
+                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,13--4,14)
+                             InKeyword = None })],
+                       YieldOrReturn
+                         ((false, true), Ident bar,
+                          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,4--5,14)),
+                       /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,4--5,14),
+                       { EqualsRange =
+                          Some
+                            /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,13--2,14) }),
+                    /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (1,6--6,1)),
+                 /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (1,0--6,1)),
+              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (1,0--6,1))],
+          PreXmlDocEmpty, [], None,
+          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (1,0--6,1),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs b/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs
new file mode 100644
index 00000000000..e03a60ba750
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs
@@ -0,0 +1,3 @@
+type Foo =
+    | Bar of string
+    | Bear of int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs.bsl b/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs.bsl
new file mode 100644
index 00000000000..a0a700d6c46
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs.bsl
@@ -0,0 +1,64 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MultipleSynUnionCasesHaveBarRange.fs", false,
+      QualifiedNameOfFile MultipleSynUnionCasesHaveBarRange, [], [],
+      [SynModuleOrNamespace
+         ([MultipleSynUnionCasesHaveBarRange], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/MultipleSynUnionCasesHaveBarRange.fs (1,5--1,8)),
+                  Simple
+                    (Union
+                       (None,
+                        [SynUnionCase
+                           ([], SynIdent (Bar, None),
+                            Fields
+                              [SynField
+                                 ([], false, None,
+                                  LongIdent
+                                    (SynLongIdent ([string], [], [None])), false,
+                                  PreXmlDoc ((2,13), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/MultipleSynUnionCasesHaveBarRange.fs (2,13--2,19),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/MultipleSynUnionCasesHaveBarRange.fs (2,6--2,19),
+                            { BarRange =
+                               Some
+                                 /root/MultipleSynUnionCasesHaveBarRange.fs (2,4--2,5) });
+                         SynUnionCase
+                           ([], SynIdent (Bear, None),
+                            Fields
+                              [SynField
+                                 ([], false, None,
+                                  LongIdent (SynLongIdent ([int], [], [None])),
+                                  false,
+                                  PreXmlDoc ((3,14), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/MultipleSynUnionCasesHaveBarRange.fs (3,14--3,17),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/MultipleSynUnionCasesHaveBarRange.fs (3,6--3,17),
+                            { BarRange =
+                               Some
+                                 /root/MultipleSynUnionCasesHaveBarRange.fs (3,4--3,5) })],
+                        /root/MultipleSynUnionCasesHaveBarRange.fs (2,4--3,17)),
+                     /root/MultipleSynUnionCasesHaveBarRange.fs (2,4--3,17)), [],
+                  None, /root/MultipleSynUnionCasesHaveBarRange.fs (1,5--3,17),
+                  { LeadingKeyword =
+                     Type /root/MultipleSynUnionCasesHaveBarRange.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/MultipleSynUnionCasesHaveBarRange.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/MultipleSynUnionCasesHaveBarRange.fs (1,0--3,17))],
+          PreXmlDocEmpty, [], None,
+          /root/MultipleSynUnionCasesHaveBarRange.fs (1,0--3,17),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamedParameter.fs b/tests/service/data/SyntaxTree/NamedParameter.fs
new file mode 100644
index 00000000000..fdd7f9f4a25
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NamedParameter.fs
@@ -0,0 +1 @@
+f(x=4)
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamedParameter.fs.bsl b/tests/service/data/SyntaxTree/NamedParameter.fs.bsl
new file mode 100644
index 00000000000..5c32662c2a3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NamedParameter.fs.bsl
@@ -0,0 +1,30 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NamedParameter.fs", false, QualifiedNameOfFile NamedParameter, [],
+      [],
+      [SynModuleOrNamespace
+         ([NamedParameter], false, AnonModule,
+          [Expr
+             (App
+                (Atomic, false, Ident f,
+                 Paren
+                   (App
+                      (NonAtomic, false,
+                       App
+                         (NonAtomic, true,
+                          LongIdent
+                            (false,
+                             SynLongIdent
+                               ([op_Equality], [], [Some (OriginalNotation "=")]),
+                             None, /root/NamedParameter.fs (1,3--1,4)), Ident x,
+                          /root/NamedParameter.fs (1,2--1,4)),
+                       Const (Int32 4, /root/NamedParameter.fs (1,4--1,5)),
+                       /root/NamedParameter.fs (1,2--1,5)),
+                    /root/NamedParameter.fs (1,1--1,2),
+                    Some /root/NamedParameter.fs (1,5--1,6),
+                    /root/NamedParameter.fs (1,1--1,6)),
+                 /root/NamedParameter.fs (1,0--1,6)),
+              /root/NamedParameter.fs (1,0--1,6))], PreXmlDocEmpty, [], None,
+          /root/NamedParameter.fs (1,0--1,6), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs b/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs
new file mode 100644
index 00000000000..6b04b0262d8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs
@@ -0,0 +1 @@
+type Foo = delegate of a: A * b: B -> c:C -> D
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs.bsl b/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs.bsl
new file mode 100644
index 00000000000..b1223dc2fa3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs.bsl
@@ -0,0 +1,114 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NamedParametersInDelegateType.fs", false,
+      QualifiedNameOfFile NamedParametersInDelegateType, [], [],
+      [SynModuleOrNamespace
+         ([NamedParametersInDelegateType], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/NamedParametersInDelegateType.fs (1,5--1,8)),
+                  ObjectModel
+                    (Delegate
+                       (Fun
+                          (Tuple
+                             (false,
+                              [Type
+                                 (SignatureParameter
+                                    ([], false, Some a,
+                                     LongIdent (SynLongIdent ([A], [], [None])),
+                                     /root/NamedParametersInDelegateType.fs (1,23--1,27)));
+                               Star
+                                 /root/NamedParametersInDelegateType.fs (1,28--1,29);
+                               Type
+                                 (SignatureParameter
+                                    ([], false, Some b,
+                                     LongIdent (SynLongIdent ([B], [], [None])),
+                                     /root/NamedParametersInDelegateType.fs (1,30--1,34)))],
+                              /root/NamedParametersInDelegateType.fs (1,23--1,34)),
+                           Fun
+                             (SignatureParameter
+                                ([], false, Some c,
+                                 LongIdent (SynLongIdent ([C], [], [None])),
+                                 /root/NamedParametersInDelegateType.fs (1,38--1,41)),
+                              LongIdent (SynLongIdent ([D], [], [None])),
+                              /root/NamedParametersInDelegateType.fs (1,38--1,46),
+                              { ArrowRange =
+                                 /root/NamedParametersInDelegateType.fs (1,42--1,44) }),
+                           /root/NamedParametersInDelegateType.fs (1,23--1,46),
+                           { ArrowRange =
+                              /root/NamedParametersInDelegateType.fs (1,35--1,37) }),
+                        SynValInfo
+                          ([[SynArgInfo ([], false, Some a);
+                             SynArgInfo ([], false, Some b)];
+                            [SynArgInfo ([], false, Some c)]],
+                           SynArgInfo ([], false, None))),
+                     [AbstractSlot
+                        (SynValSig
+                           ([], SynIdent (Invoke, None),
+                            SynValTyparDecls (None, true),
+                            Fun
+                              (Tuple
+                                 (false,
+                                  [Type
+                                     (SignatureParameter
+                                        ([], false, Some a,
+                                         LongIdent
+                                           (SynLongIdent ([A], [], [None])),
+                                         /root/NamedParametersInDelegateType.fs (1,23--1,27)));
+                                   Star
+                                     /root/NamedParametersInDelegateType.fs (1,28--1,29);
+                                   Type
+                                     (SignatureParameter
+                                        ([], false, Some b,
+                                         LongIdent
+                                           (SynLongIdent ([B], [], [None])),
+                                         /root/NamedParametersInDelegateType.fs (1,30--1,34)))],
+                                  /root/NamedParametersInDelegateType.fs (1,23--1,34)),
+                               Fun
+                                 (SignatureParameter
+                                    ([], false, Some c,
+                                     LongIdent (SynLongIdent ([C], [], [None])),
+                                     /root/NamedParametersInDelegateType.fs (1,38--1,41)),
+                                  LongIdent (SynLongIdent ([D], [], [None])),
+                                  /root/NamedParametersInDelegateType.fs (1,38--1,46),
+                                  { ArrowRange =
+                                     /root/NamedParametersInDelegateType.fs (1,42--1,44) }),
+                               /root/NamedParametersInDelegateType.fs (1,23--1,46),
+                               { ArrowRange =
+                                  /root/NamedParametersInDelegateType.fs (1,35--1,37) }),
+                            SynValInfo
+                              ([[SynArgInfo ([], false, Some a);
+                                 SynArgInfo ([], false, Some b)];
+                                [SynArgInfo ([], false, Some c)]],
+                               SynArgInfo ([], false, None)), false, false,
+                            PreXmlDocEmpty, None, None,
+                            /root/NamedParametersInDelegateType.fs (1,11--1,46),
+                            { LeadingKeyword = Synthetic
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = Member },
+                         /root/NamedParametersInDelegateType.fs (1,11--1,46),
+                         { GetSetKeywords = None })],
+                     /root/NamedParametersInDelegateType.fs (1,11--1,46)), [],
+                  None, /root/NamedParametersInDelegateType.fs (1,5--1,46),
+                  { LeadingKeyword =
+                     Type /root/NamedParametersInDelegateType.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/NamedParametersInDelegateType.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/NamedParametersInDelegateType.fs (1,0--1,46))],
+          PreXmlDocEmpty, [], None,
+          /root/NamedParametersInDelegateType.fs (1,0--1,46),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NameofOperator.fs b/tests/service/data/SyntaxTree/NameofOperator.fs
new file mode 100644
index 00000000000..5a7913fb4de
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NameofOperator.fs
@@ -0,0 +1 @@
+nameof(+)
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NameofOperator.fs.bsl b/tests/service/data/SyntaxTree/NameofOperator.fs.bsl
new file mode 100644
index 00000000000..b2b9dca8f49
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NameofOperator.fs.bsl
@@ -0,0 +1,23 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NameofOperator.fs", false, QualifiedNameOfFile NameofOperator, [],
+      [],
+      [SynModuleOrNamespace
+         ([NameofOperator], false, AnonModule,
+          [Expr
+             (App
+                (Atomic, false, Ident nameof,
+                 LongIdent
+                   (false,
+                    SynLongIdent
+                      ([op_Addition], [],
+                       [Some
+                          (OriginalNotationWithParen
+                             (/root/NameofOperator.fs (1,6--1,7), "+",
+                              /root/NameofOperator.fs (1,8--1,9)))]), None,
+                    /root/NameofOperator.fs (1,6--1,9)),
+                 /root/NameofOperator.fs (1,0--1,9)),
+              /root/NameofOperator.fs (1,0--1,9))], PreXmlDocEmpty, [], None,
+          /root/NameofOperator.fs (1,0--1,9), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs
new file mode 100644
index 00000000000..e932efe94f2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs
@@ -0,0 +1,3 @@
+namespace Foo
+module Bar =
+let a = 42
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs.bsl
new file mode 100644
index 00000000000..fd480fe3991
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs.bsl
@@ -0,0 +1,52 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NamespaceShouldContainNamespaceKeyword.fs", false,
+      QualifiedNameOfFile NamespaceShouldContainNamespaceKeyword, [], [],
+      [SynModuleOrNamespace
+         ([Foo], false, DeclaredNamespace,
+          [NestedModule
+             (SynComponentInfo
+                ([], None, [], [Bar],
+                 PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 None,
+                 /root/NamespaceShouldContainNamespaceKeyword.fs (2,0--2,10)),
+              false,
+              [Let
+                 (false,
+                  [SynBinding
+                     (None, Normal, false, false, [],
+                      PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                      SynValData
+                        (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                         None),
+                      Named
+                        (SynIdent (a, None), false, None,
+                         /root/NamespaceShouldContainNamespaceKeyword.fs (3,4--3,5)),
+                      None,
+                      Const
+                        (Int32 42,
+                         /root/NamespaceShouldContainNamespaceKeyword.fs (3,8--3,10)),
+                      /root/NamespaceShouldContainNamespaceKeyword.fs (3,4--3,5),
+                      Yes
+                        /root/NamespaceShouldContainNamespaceKeyword.fs (3,0--3,10),
+                      { LeadingKeyword =
+                         Let
+                           /root/NamespaceShouldContainNamespaceKeyword.fs (3,0--3,3)
+                        InlineKeyword = None
+                        EqualsRange =
+                         Some
+                           /root/NamespaceShouldContainNamespaceKeyword.fs (3,6--3,7) })],
+                  /root/NamespaceShouldContainNamespaceKeyword.fs (3,0--3,10))],
+              false, /root/NamespaceShouldContainNamespaceKeyword.fs (2,0--3,10),
+              { ModuleKeyword =
+                 Some /root/NamespaceShouldContainNamespaceKeyword.fs (2,0--2,6)
+                EqualsRange =
+                 Some
+                   /root/NamespaceShouldContainNamespaceKeyword.fs (2,11--2,12) })],
+          PreXmlDocEmpty, [], None,
+          /root/NamespaceShouldContainNamespaceKeyword.fs (1,0--3,10),
+          { LeadingKeyword =
+             Namespace
+               /root/NamespaceShouldContainNamespaceKeyword.fs (1,0--1,9) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi
new file mode 100644
index 00000000000..c696b6f03a8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi
@@ -0,0 +1,3 @@
+namespace Foo
+module Bar =
+val a: int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi.bsl b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi.bsl
new file mode 100644
index 00000000000..c36dc2fcf20
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi.bsl
@@ -0,0 +1,42 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/NamespaceShouldContainNamespaceKeyword.fsi",
+      QualifiedNameOfFile NamespaceShouldContainNamespaceKeyword, [], [],
+      [SynModuleOrNamespaceSig
+         ([Foo], false, DeclaredNamespace,
+          [NestedModule
+             (SynComponentInfo
+                ([], None, [], [Bar],
+                 PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 None,
+                 /root/NamespaceShouldContainNamespaceKeyword.fsi (2,0--2,10)),
+              false,
+              [Val
+                 (SynValSig
+                    ([], SynIdent (a, None), SynValTyparDecls (None, true),
+                     LongIdent (SynLongIdent ([int], [], [None])),
+                     SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     None, None,
+                     /root/NamespaceShouldContainNamespaceKeyword.fsi (3,0--3,10),
+                     { LeadingKeyword =
+                        Val
+                          /root/NamespaceShouldContainNamespaceKeyword.fsi (3,0--3,3)
+                       InlineKeyword = None
+                       WithKeyword = None
+                       EqualsRange = None }),
+                  /root/NamespaceShouldContainNamespaceKeyword.fsi (3,0--3,10))],
+              /root/NamespaceShouldContainNamespaceKeyword.fsi (2,0--3,10),
+              { ModuleKeyword =
+                 Some
+                   /root/NamespaceShouldContainNamespaceKeyword.fsi (2,0--2,6)
+                EqualsRange =
+                 Some
+                   /root/NamespaceShouldContainNamespaceKeyword.fsi (2,11--2,12) })],
+          PreXmlDocEmpty, [], None,
+          /root/NamespaceShouldContainNamespaceKeyword.fsi (1,0--3,10),
+          { LeadingKeyword =
+             Namespace
+               /root/NamespaceShouldContainNamespaceKeyword.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs b/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs
new file mode 100644
index 00000000000..b76eb5211f5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs
@@ -0,0 +1,3 @@
+if a then
+b
+elif c then d
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs.bsl
new file mode 100644
index 00000000000..e25344bd825
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs.bsl
@@ -0,0 +1,33 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NestedElifInIfThenElse.fs", false,
+      QualifiedNameOfFile NestedElifInIfThenElse, [], [],
+      [SynModuleOrNamespace
+         ([NestedElifInIfThenElse], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b,
+                 Some
+                   (IfThenElse
+                      (Ident c, Ident d, None,
+                       Yes /root/NestedElifInIfThenElse.fs (3,0--3,11), false,
+                       /root/NestedElifInIfThenElse.fs (3,0--3,13),
+                       { IfKeyword = /root/NestedElifInIfThenElse.fs (3,0--3,4)
+                         IsElif = true
+                         ThenKeyword =
+                          /root/NestedElifInIfThenElse.fs (3,7--3,11)
+                         ElseKeyword = None
+                         IfToThenRange =
+                          /root/NestedElifInIfThenElse.fs (3,0--3,11) })),
+                 Yes /root/NestedElifInIfThenElse.fs (1,0--1,9), false,
+                 /root/NestedElifInIfThenElse.fs (1,0--3,13),
+                 { IfKeyword = /root/NestedElifInIfThenElse.fs (1,0--1,2)
+                   IsElif = false
+                   ThenKeyword = /root/NestedElifInIfThenElse.fs (1,5--1,9)
+                   ElseKeyword = None
+                   IfToThenRange = /root/NestedElifInIfThenElse.fs (1,0--1,9) }),
+              /root/NestedElifInIfThenElse.fs (1,0--3,13))], PreXmlDocEmpty, [],
+          None, /root/NestedElifInIfThenElse.fs (1,0--3,13),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs b/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs
new file mode 100644
index 00000000000..bc0923bc492
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs
@@ -0,0 +1,4 @@
+if a then
+    b
+else
+    if c then d
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs.bsl
new file mode 100644
index 00000000000..caaed8e14e4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs.bsl
@@ -0,0 +1,35 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NestedElseIfInIfThenElse.fs", false,
+      QualifiedNameOfFile NestedElseIfInIfThenElse, [], [],
+      [SynModuleOrNamespace
+         ([NestedElseIfInIfThenElse], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b,
+                 Some
+                   (IfThenElse
+                      (Ident c, Ident d, None,
+                       Yes /root/NestedElseIfInIfThenElse.fs (4,4--4,13), false,
+                       /root/NestedElseIfInIfThenElse.fs (4,4--4,15),
+                       { IfKeyword =
+                          /root/NestedElseIfInIfThenElse.fs (4,4--4,6)
+                         IsElif = false
+                         ThenKeyword =
+                          /root/NestedElseIfInIfThenElse.fs (4,9--4,13)
+                         ElseKeyword = None
+                         IfToThenRange =
+                          /root/NestedElseIfInIfThenElse.fs (4,4--4,13) })),
+                 Yes /root/NestedElseIfInIfThenElse.fs (1,0--1,9), false,
+                 /root/NestedElseIfInIfThenElse.fs (1,0--4,15),
+                 { IfKeyword = /root/NestedElseIfInIfThenElse.fs (1,0--1,2)
+                   IsElif = false
+                   ThenKeyword = /root/NestedElseIfInIfThenElse.fs (1,5--1,9)
+                   ElseKeyword =
+                    Some /root/NestedElseIfInIfThenElse.fs (3,0--3,4)
+                   IfToThenRange = /root/NestedElseIfInIfThenElse.fs (1,0--1,9) }),
+              /root/NestedElseIfInIfThenElse.fs (1,0--4,15))], PreXmlDocEmpty,
+          [], None, /root/NestedElseIfInIfThenElse.fs (1,0--4,15),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs b/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs
new file mode 100644
index 00000000000..e9abdb6f804
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs
@@ -0,0 +1,4 @@
+if a then
+b
+else if c then
+d
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
new file mode 100644
index 00000000000..b8c3a866b2b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
@@ -0,0 +1,43 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NestedElseIfOnTheSameLineInIfThenElse.fs", false,
+      QualifiedNameOfFile NestedElseIfOnTheSameLineInIfThenElse, [], [],
+      [SynModuleOrNamespace
+         ([NestedElseIfOnTheSameLineInIfThenElse], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b,
+                 Some
+                   (IfThenElse
+                      (Ident c, Ident d, None,
+                       Yes
+                         /root/NestedElseIfOnTheSameLineInIfThenElse.fs (3,5--3,14),
+                       false,
+                       /root/NestedElseIfOnTheSameLineInIfThenElse.fs (3,5--4,1),
+                       { IfKeyword =
+                          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (3,5--3,7)
+                         IsElif = false
+                         ThenKeyword =
+                          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (3,10--3,14)
+                         ElseKeyword = None
+                         IfToThenRange =
+                          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (3,5--3,14) })),
+                 Yes /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,0--1,9),
+                 false,
+                 /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,0--4,1),
+                 { IfKeyword =
+                    /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,0--1,2)
+                   IsElif = false
+                   ThenKeyword =
+                    /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,5--1,9)
+                   ElseKeyword =
+                    Some
+                      /root/NestedElseIfOnTheSameLineInIfThenElse.fs (3,0--3,4)
+                   IfToThenRange =
+                    /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,0--1,9) }),
+              /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,0--4,1))],
+          PreXmlDocEmpty, [], None,
+          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,0--4,1),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi b/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi
new file mode 100644
index 00000000000..ccee94ac65e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi
@@ -0,0 +1,12 @@
+namespace Foobar
+
+val v : int =
+    #if FOO
+        #if MEH
+        1
+        #else
+        2
+        #endif
+    #else
+        3
+    #endif
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi.bsl
new file mode 100644
index 00000000000..61daf267fbf
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi.bsl
@@ -0,0 +1,38 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/NestedIfElseEndif,SignatureFile.fsi",
+      QualifiedNameOfFile NestedIfElseEndif,SignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Foobar], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (v, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 Some
+                   (Const
+                      (Int32 3,
+                       /root/NestedIfElseEndif,SignatureFile.fsi (11,8--11,9))),
+                 /root/NestedIfElseEndif,SignatureFile.fsi (3,0--11,9),
+                 { LeadingKeyword =
+                    Val /root/NestedIfElseEndif,SignatureFile.fsi (3,0--3,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange =
+                    Some /root/NestedIfElseEndif,SignatureFile.fsi (3,12--3,13) }),
+              /root/NestedIfElseEndif,SignatureFile.fsi (3,0--11,9))],
+          PreXmlDocEmpty, [], None,
+          /root/NestedIfElseEndif,SignatureFile.fsi (1,0--11,9),
+          { LeadingKeyword =
+             Namespace /root/NestedIfElseEndif,SignatureFile.fsi (1,0--1,9) })],
+      { ConditionalDirectives =
+         [If
+            (Ident "FOO", /root/NestedIfElseEndif,SignatureFile.fsi (4,4--4,11));
+          If
+            (Ident "MEH", /root/NestedIfElseEndif,SignatureFile.fsi (5,8--5,15));
+          Else /root/NestedIfElseEndif,SignatureFile.fsi (7,8--7,13);
+          EndIf /root/NestedIfElseEndif,SignatureFile.fsi (9,8--9,14);
+          Else /root/NestedIfElseEndif,SignatureFile.fsi (10,4--10,9);
+          EndIf /root/NestedIfElseEndif,SignatureFile.fsi (12,4--12,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfElseEndif.fs b/tests/service/data/SyntaxTree/NestedIfElseEndif.fs
new file mode 100644
index 00000000000..dddff55d076
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedIfElseEndif.fs
@@ -0,0 +1,10 @@
+let v =
+    #if FOO
+        #if MEH
+        1
+        #else
+        2
+        #endif
+    #else
+        3
+    #endif
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/NestedIfElseEndif.fs.bsl
new file mode 100644
index 00000000000..6d20d0beb3d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedIfElseEndif.fs.bsl
@@ -0,0 +1,33 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NestedIfElseEndif.fs", false, QualifiedNameOfFile NestedIfElseEndif,
+      [], [],
+      [SynModuleOrNamespace
+         ([NestedIfElseEndif], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/NestedIfElseEndif.fs (1,4--1,5)), None,
+                  Const (Int32 3, /root/NestedIfElseEndif.fs (9,8--9,9)),
+                  /root/NestedIfElseEndif.fs (1,4--1,5),
+                  Yes /root/NestedIfElseEndif.fs (1,0--9,9),
+                  { LeadingKeyword = Let /root/NestedIfElseEndif.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange = Some /root/NestedIfElseEndif.fs (1,6--1,7) })],
+              /root/NestedIfElseEndif.fs (1,0--9,9))], PreXmlDocEmpty, [], None,
+          /root/NestedIfElseEndif.fs (1,0--10,10), { LeadingKeyword = None })],
+      (true, false),
+      { ConditionalDirectives =
+         [If (Ident "FOO", /root/NestedIfElseEndif.fs (2,4--2,11));
+          If (Ident "MEH", /root/NestedIfElseEndif.fs (3,8--3,15));
+          Else /root/NestedIfElseEndif.fs (5,8--5,13);
+          EndIf /root/NestedIfElseEndif.fs (7,8--7,14);
+          Else /root/NestedIfElseEndif.fs (8,4--8,9);
+          EndIf /root/NestedIfElseEndif.fs (10,4--10,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi
new file mode 100644
index 00000000000..660a05cefca
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi
@@ -0,0 +1,11 @@
+namespace Foobar
+
+val v : int =
+    #if !DEBUG
+        #if FOO && BAR
+            #if MEH || HMM
+                9
+            #endif
+        #endif
+    #endif
+    10
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi.bsl
new file mode 100644
index 00000000000..b7288788236
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi.bsl
@@ -0,0 +1,49 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi",
+      QualifiedNameOfFile NestedIfEndifWithComplexExpressions,SignatureFile, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([Foobar], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (v, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 Some
+                   (Const
+                      (Int32 10,
+                       /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (11,4--11,6))),
+                 /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (3,0--11,6),
+                 { LeadingKeyword =
+                    Val
+                      /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (3,0--3,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange =
+                    Some
+                      /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (3,12--3,13) }),
+              /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (3,0--11,6))],
+          PreXmlDocEmpty, [], None,
+          /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (1,0--11,6),
+          { LeadingKeyword =
+             Namespace
+               /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (1,0--1,9) })],
+      { ConditionalDirectives =
+         [If
+            (Not (Ident "DEBUG"),
+             /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (4,4--4,14));
+          If
+            (And (Ident "FOO", Ident "BAR"),
+             /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (5,8--5,22));
+          If
+            (Or (Ident "MEH", Ident "HMM"),
+             /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (6,12--6,26));
+          EndIf
+            /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (8,12--8,18);
+          EndIf
+            /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (9,8--9,14);
+          EndIf
+            /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (10,4--10,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs
new file mode 100644
index 00000000000..f5d2aadc865
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs
@@ -0,0 +1,8 @@
+let v =
+    #if !DEBUG
+        #if FOO && BAR
+            #if MEH || HMM
+                printfn "oh some logging"
+            #endif
+        #endif
+    #endif
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs.bsl b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs.bsl
new file mode 100644
index 00000000000..9995dcf10cc
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs.bsl
@@ -0,0 +1,46 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NestedIfEndifWithComplexExpressions.fs", false,
+      QualifiedNameOfFile NestedIfEndifWithComplexExpressions, [], [],
+      [SynModuleOrNamespace
+         ([NestedIfEndifWithComplexExpressions], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/NestedIfEndifWithComplexExpressions.fs (1,4--1,5)),
+                  None,
+                  ArbitraryAfterError
+                    ("localBinding1",
+                     /root/NestedIfEndifWithComplexExpressions.fs (1,7--1,7)),
+                  /root/NestedIfEndifWithComplexExpressions.fs (1,4--1,5),
+                  Yes /root/NestedIfEndifWithComplexExpressions.fs (1,4--1,7),
+                  { LeadingKeyword =
+                     Let /root/NestedIfEndifWithComplexExpressions.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/NestedIfEndifWithComplexExpressions.fs (1,6--1,7) })],
+              /root/NestedIfEndifWithComplexExpressions.fs (1,0--1,7))],
+          PreXmlDocEmpty, [], None,
+          /root/NestedIfEndifWithComplexExpressions.fs (1,0--8,10),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives =
+         [If
+            (Not (Ident "DEBUG"),
+             /root/NestedIfEndifWithComplexExpressions.fs (2,4--2,14));
+          If
+            (And (Ident "FOO", Ident "BAR"),
+             /root/NestedIfEndifWithComplexExpressions.fs (3,8--3,22));
+          If
+            (Or (Ident "MEH", Ident "HMM"),
+             /root/NestedIfEndifWithComplexExpressions.fs (4,12--4,26));
+          EndIf /root/NestedIfEndifWithComplexExpressions.fs (6,12--6,18);
+          EndIf /root/NestedIfEndifWithComplexExpressions.fs (7,8--7,14);
+          EndIf /root/NestedIfEndifWithComplexExpressions.fs (8,4--8,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs
new file mode 100644
index 00000000000..ca1977607d7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs
@@ -0,0 +1,4 @@
+let f () =
+    let x = 1 in // the "in" keyword is available in F#
+    let y = 2 in
+    x + y
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
new file mode 100644
index 00000000000..013f160709c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
@@ -0,0 +1,116 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs", false,
+      QualifiedNameOfFile NestedSynExprLetOrUseContainsTheRangeOfInKeyword, [],
+      [],
+      [SynModuleOrNamespace
+         ([NestedSynExprLetOrUseContainsTheRangeOfInKeyword], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([f], [], [None]), None, None,
+                     Pats
+                       [Paren
+                          (Const
+                             (Unit,
+                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,6--1,8)),
+                           /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,6--1,8))],
+                     None,
+                     /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,4--1,8)),
+                  None,
+                  LetOrUse
+                    (false, false,
+                     [SynBinding
+                        (None, Normal, false, false, [],
+                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         SynValData
+                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                            None),
+                         Named
+                           (SynIdent (x, None), false, None,
+                            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,8--2,9)),
+                         None,
+                         Const
+                           (Int32 1,
+                            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,12--2,13)),
+                         /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,8--2,9),
+                         Yes
+                           /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,13),
+                         { LeadingKeyword =
+                            Let
+                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,7)
+                           InlineKeyword = None
+                           EqualsRange =
+                            Some
+                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,10--2,11) })],
+                     LetOrUse
+                       (false, false,
+                        [SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (None,
+                               SynValInfo ([], SynArgInfo ([], false, None)),
+                               None),
+                            Named
+                              (SynIdent (y, None), false, None,
+                               /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,8--3,9)),
+                            None,
+                            Const
+                              (Int32 2,
+                               /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,12--3,13)),
+                            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,8--3,9),
+                            Yes
+                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--3,13),
+                            { LeadingKeyword =
+                               Let
+                                 /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--3,7)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,10--3,11) })],
+                        App
+                          (NonAtomic, false,
+                           App
+                             (NonAtomic, true,
+                              LongIdent
+                                (false,
+                                 SynLongIdent
+                                   ([op_Addition], [],
+                                    [Some (OriginalNotation "+")]), None,
+                                 /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,6--4,7)),
+                              Ident x,
+                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,4--4,7)),
+                           Ident y,
+                           /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,4--4,9)),
+                        /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--4,9),
+                        { InKeyword =
+                           Some
+                             /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,14--3,16) }),
+                     /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--4,9),
+                     { InKeyword =
+                        Some
+                          /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,14--2,16) }),
+                  /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,4--1,8),
+                  NoneAtLet,
+                  { LeadingKeyword =
+                     Let
+                       /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,9--1,10) })],
+              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--4,9))],
+          PreXmlDocEmpty, [], None,
+          /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--4,9),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,17--2,55)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs b/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs
new file mode 100644
index 00000000000..d92dc80cc9e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs
@@ -0,0 +1 @@
+let inline (!!) (x: ^a * ^b) : ^c = ((^a or ^b or ^c): (static member op_Implicit: ^a * ^b -> ^c) x)
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
new file mode 100644
index 00000000000..fe8523da2d2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
@@ -0,0 +1,152 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NestedSynTypeOrInsideSynExprTraitCall.fs", false,
+      QualifiedNameOfFile NestedSynTypeOrInsideSynExprTraitCall, [], [],
+      [SynModuleOrNamespace
+         ([NestedSynTypeOrInsideSynExprTraitCall], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, true, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some x)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent
+                       ([op_BangBang], [],
+                        [Some
+                           (OriginalNotationWithParen
+                              (/root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,11--1,12),
+                               "!!",
+                               /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,14--1,15)))]),
+                     None, None,
+                     Pats
+                       [Paren
+                          (Typed
+                             (Named
+                                (SynIdent (x, None), false, None,
+                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,17--1,18)),
+                              Tuple
+                                (false,
+                                 [Type
+                                    (Var
+                                       (SynTypar (a, HeadType, false),
+                                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,20--1,22)));
+                                  Star
+                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,23--1,24);
+                                  Type
+                                    (Var
+                                       (SynTypar (b, HeadType, false),
+                                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,25--1,27)))],
+                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,20--1,27)),
+                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,17--1,27)),
+                           /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,16--1,28))],
+                     None,
+                     /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,11--1,28)),
+                  Some
+                    (SynBindingReturnInfo
+                       (Var
+                          (SynTypar (c, HeadType, false),
+                           /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,31--1,33)),
+                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,31--1,33),
+                        [],
+                        { ColonRange =
+                           Some
+                             /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,29--1,30) })),
+                  Typed
+                    (Paren
+                       (TraitCall
+                          (Paren
+                             (Or
+                                (Or
+                                   (Var
+                                      (SynTypar (a, HeadType, false),
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,38--1,40)),
+                                    Var
+                                      (SynTypar (b, HeadType, false),
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,44--1,46)),
+                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,38--1,46),
+                                    { OrKeyword =
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,41--1,43) }),
+                                 Var
+                                   (SynTypar (c, HeadType, false),
+                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,50--1,52)),
+                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,38--1,52),
+                                 { OrKeyword =
+                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,47--1,49) }),
+                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,37--1,53)),
+                           Member
+                             (SynValSig
+                                ([], SynIdent (op_Implicit, None),
+                                 SynValTyparDecls (None, true),
+                                 Fun
+                                   (Tuple
+                                      (false,
+                                       [Type
+                                          (Var
+                                             (SynTypar (a, HeadType, false),
+                                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,83--1,85)));
+                                        Star
+                                          /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,86--1,87);
+                                        Type
+                                          (Var
+                                             (SynTypar (b, HeadType, false),
+                                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,88--1,90)))],
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,83--1,90)),
+                                    Var
+                                      (SynTypar (c, HeadType, false),
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,94--1,96)),
+                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,83--1,96),
+                                    { ArrowRange =
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,91--1,93) }),
+                                 SynValInfo
+                                   ([[SynArgInfo ([], false, None);
+                                      SynArgInfo ([], false, None)]],
+                                    SynArgInfo ([], false, None)), false, false,
+                                 PreXmlDoc ((1,56), FSharp.Compiler.Xml.XmlDocCollector),
+                                 None, None,
+                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,56--1,96),
+                                 { LeadingKeyword =
+                                    StaticMember
+                                      (/root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,56--1,62),
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,63--1,69))
+                                   InlineKeyword = None
+                                   WithKeyword = None
+                                   EqualsRange = None }),
+                              { IsInstance = false
+                                IsDispatchSlot = false
+                                IsOverrideOrExplicitImpl = false
+                                IsFinal = false
+                                GetterOrSetterIsCompilerGenerated = false
+                                MemberKind = Member },
+                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,56--1,96),
+                              { GetSetKeywords = None }), Ident x,
+                           /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,36--1,100)),
+                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,36--1,37),
+                        Some
+                          /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,99--1,100),
+                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,36--1,100)),
+                     Var
+                       (SynTypar (c, HeadType, false),
+                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,31--1,33)),
+                     /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,36--1,100)),
+                  /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,11--1,28),
+                  NoneAtLet,
+                  { LeadingKeyword =
+                     Let
+                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,0--1,3)
+                    InlineKeyword =
+                     Some
+                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,4--1,10)
+                    EqualsRange =
+                     Some
+                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,34--1,35) })],
+              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,0--1,100))],
+          PreXmlDocEmpty, [], None,
+          /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,0--1,100),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs
new file mode 100644
index 00000000000..f370fb4f8bc
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs
@@ -0,0 +1,4 @@
+type A =
+    static type B =
+                    class
+                    end
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
new file mode 100644
index 00000000000..9893747cba6
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
@@ -0,0 +1,52 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NestedTypeHasStaticTypeAsLeadingKeyword.fs", false,
+      QualifiedNameOfFile NestedTypeHasStaticTypeAsLeadingKeyword, [], [],
+      [SynModuleOrNamespace
+         ([NestedTypeHasStaticTypeAsLeadingKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [A],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [NestedType
+                        (SynTypeDefn
+                           (SynComponentInfo
+                              ([], None, [], [B],
+                               PreXmlDoc ((2,16), FSharp.Compiler.Xml.XmlDocCollector),
+                               false, None,
+                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,16--2,17)),
+                            ObjectModel
+                              (Class, [],
+                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,20--4,23)),
+                            [], None,
+                            /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,16--4,23),
+                            { LeadingKeyword =
+                               StaticType
+                                 (/root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,4--2,10),
+                                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,11--2,15))
+                              EqualsRange =
+                               Some
+                                 /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,18--2,19)
+                              WithKeyword = None }), None,
+                         /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,4--4,23))],
+                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,4--4,23)),
+                  [], None,
+                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (1,5--4,23),
+                  { LeadingKeyword =
+                     Type
+                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (1,0--4,23))],
+          PreXmlDocEmpty, [], None,
+          /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (1,0--4,23),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi
new file mode 100644
index 00000000000..f370fb4f8bc
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi
@@ -0,0 +1,4 @@
+type A =
+    static type B =
+                    class
+                    end
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
new file mode 100644
index 00000000000..114ba6fa2f3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
@@ -0,0 +1,51 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi",
+      QualifiedNameOfFile NestedTypeHasStaticTypeAsLeadingKeyword, [], [],
+      [SynModuleOrNamespaceSig
+         ([NestedTypeHasStaticTypeAsLeadingKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [A],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [NestedType
+                        (SynTypeDefnSig
+                           (SynComponentInfo
+                              ([], None, [], [B],
+                               PreXmlDoc ((2,16), FSharp.Compiler.Xml.XmlDocCollector),
+                               false, None,
+                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,16--2,17)),
+                            ObjectModel
+                              (Class, [],
+                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,20--4,23)),
+                            [],
+                            /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,16--4,23),
+                            { LeadingKeyword =
+                               StaticType
+                                 (/root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,4--2,10),
+                                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,11--2,15))
+                              EqualsRange =
+                               Some
+                                 /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,18--2,19)
+                              WithKeyword = None }),
+                         /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,4--4,23))],
+                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,4--4,23)),
+                  [],
+                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (1,5--4,23),
+                  { LeadingKeyword =
+                     Type
+                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (1,7--1,8)
+                    WithKeyword = None })],
+              /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (1,0--4,23))],
+          PreXmlDocEmpty, [], None,
+          /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (1,0--4,23),
+          { LeadingKeyword = None })], { ConditionalDirectives = []
+                                         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NewKeyword.fs b/tests/service/data/SyntaxTree/NewKeyword.fs
new file mode 100644
index 00000000000..4134f032c1b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NewKeyword.fs
@@ -0,0 +1,2 @@
+type Y() =
+    new (message:string) = Y()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NewKeyword.fs.bsl b/tests/service/data/SyntaxTree/NewKeyword.fs.bsl
new file mode 100644
index 00000000000..16b8ae55255
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NewKeyword.fs.bsl
@@ -0,0 +1,72 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NewKeyword.fs", false, QualifiedNameOfFile NewKeyword, [], [],
+      [SynModuleOrNamespace
+         ([NewKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Y],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/NewKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats ([], /root/NewKeyword.fs (1,6--1,8)), None,
+                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/NewKeyword.fs (1,5--1,6), { AsKeyword = None });
+                      Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = false
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Constructor },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, Some message)]],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent ([new], [], [None]), None,
+                               Some (SynValTyparDecls (None, false)),
+                               Pats
+                                 [Paren
+                                    (Typed
+                                       (Named
+                                          (SynIdent (message, None), false, None,
+                                           /root/NewKeyword.fs (2,9--2,16)),
+                                        LongIdent
+                                          (SynLongIdent ([string], [], [None])),
+                                        /root/NewKeyword.fs (2,9--2,23)),
+                                     /root/NewKeyword.fs (2,8--2,24))], None,
+                               /root/NewKeyword.fs (2,4--2,7)), None,
+                            App
+                              (Atomic, false, Ident Y,
+                               Const (Unit, /root/NewKeyword.fs (2,28--2,30)),
+                               /root/NewKeyword.fs (2,27--2,30)),
+                            /root/NewKeyword.fs (2,4--2,24), NoneAtInvisible,
+                            { LeadingKeyword =
+                               New /root/NewKeyword.fs (2,4--2,7)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some /root/NewKeyword.fs (2,25--2,26) }),
+                         /root/NewKeyword.fs (2,4--2,30))],
+                     /root/NewKeyword.fs (2,4--2,30)), [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats ([], /root/NewKeyword.fs (1,6--1,8)), None,
+                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/NewKeyword.fs (1,5--1,6), { AsKeyword = None })),
+                  /root/NewKeyword.fs (1,5--2,30),
+                  { LeadingKeyword = Type /root/NewKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/NewKeyword.fs (1,9--1,10)
+                    WithKeyword = None })], /root/NewKeyword.fs (1,0--2,30))],
+          PreXmlDocEmpty, [], None, /root/NewKeyword.fs (1,0--2,30),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs b/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
new file mode 100644
index 00000000000..640939533e7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
@@ -0,0 +1,5 @@
+try
+    foo ()
+with exn ->
+    // some comment
+    ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
new file mode 100644
index 00000000000..6a661034c54
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
@@ -0,0 +1,52 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs", false,
+      QualifiedNameOfFile NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith,
+      [], [],
+      [SynModuleOrNamespace
+         ([NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith], false,
+          AnonModule,
+          [Expr
+             (TryWith
+                (App
+                   (NonAtomic, false, Ident foo,
+                    Const
+                      (Unit,
+                       /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,8--2,10)),
+                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,4--2,10)),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (exn, None), false, None,
+                        /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,5--3,8)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,4--5,6)),
+                     /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,5--5,6),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,9--3,11)
+                       BarRange = None })],
+                 /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--5,6),
+                 Yes
+                   /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--1,3),
+                 Yes
+                   /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,0--3,4),
+                 { TryKeyword =
+                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--1,3)
+                   TryToWithRange =
+                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--3,4)
+                   WithKeyword =
+                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,0--3,4)
+                   WithToEndRange =
+                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,0--5,6) }),
+              /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--5,6))],
+          PreXmlDocEmpty, [], None,
+          /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--5,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,4--4,19)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs b/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs
new file mode 100644
index 00000000000..8b79151aec3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs
@@ -0,0 +1,3 @@
+type X() =
+    let mutable allowInto = 0
+    member _.AllowIntoPattern with get() = allowInto and set v = allowInto <- v
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs.bsl b/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs.bsl
new file mode 100644
index 00000000000..762960b7295
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs.bsl
@@ -0,0 +1,161 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ObjectModelWithTwoMembers.fs", false,
+      QualifiedNameOfFile ObjectModelWithTwoMembers, [], [],
+      [SynModuleOrNamespace
+         ([ObjectModelWithTwoMembers], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/ObjectModelWithTwoMembers.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([], /root/ObjectModelWithTwoMembers.fs (1,6--1,8)),
+                         None,
+                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/ObjectModelWithTwoMembers.fs (1,5--1,6),
+                         { AsKeyword = None });
+                      LetBindings
+                        ([SynBinding
+                            (None, Normal, false, true, [],
+                             PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                             SynValData
+                               (None,
+                                SynValInfo ([], SynArgInfo ([], false, None)),
+                                None),
+                             Named
+                               (SynIdent (allowInto, None), false, None,
+                                /root/ObjectModelWithTwoMembers.fs (2,16--2,25)),
+                             None,
+                             Const
+                               (Int32 0,
+                                /root/ObjectModelWithTwoMembers.fs (2,28--2,29)),
+                             /root/ObjectModelWithTwoMembers.fs (2,16--2,25),
+                             Yes /root/ObjectModelWithTwoMembers.fs (2,4--2,29),
+                             { LeadingKeyword =
+                                Let
+                                  /root/ObjectModelWithTwoMembers.fs (2,4--2,7)
+                               InlineKeyword = None
+                               EqualsRange =
+                                Some
+                                  /root/ObjectModelWithTwoMembers.fs (2,26--2,27) })],
+                         false, false,
+                         /root/ObjectModelWithTwoMembers.fs (2,4--2,29));
+                      GetSetMember
+                        (Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertyGet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)]; []],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([_; AllowIntoPattern],
+                                     [/root/ObjectModelWithTwoMembers.fs (3,12--3,13)],
+                                     [None; None]), Some get, None,
+                                  Pats
+                                    [Paren
+                                       (Const
+                                          (Unit,
+                                           /root/ObjectModelWithTwoMembers.fs (3,38--3,40)),
+                                        /root/ObjectModelWithTwoMembers.fs (3,38--3,40))],
+                                  None,
+                                  /root/ObjectModelWithTwoMembers.fs (3,35--3,40)),
+                               None, Ident allowInto,
+                               /root/ObjectModelWithTwoMembers.fs (3,35--3,40),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/ObjectModelWithTwoMembers.fs (3,4--3,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/ObjectModelWithTwoMembers.fs (3,41--3,42) })),
+                         Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertySet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)];
+                                      [SynArgInfo ([], false, Some v)]],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([_; AllowIntoPattern],
+                                     [/root/ObjectModelWithTwoMembers.fs (3,12--3,13)],
+                                     [None; None]), Some set, None,
+                                  Pats
+                                    [Named
+                                       (SynIdent (v, None), false, None,
+                                        /root/ObjectModelWithTwoMembers.fs (3,61--3,62))],
+                                  None,
+                                  /root/ObjectModelWithTwoMembers.fs (3,57--3,62)),
+                               None,
+                               LongIdentSet
+                                 (SynLongIdent ([allowInto], [], [None]),
+                                  Ident v,
+                                  /root/ObjectModelWithTwoMembers.fs (3,65--3,79)),
+                               /root/ObjectModelWithTwoMembers.fs (3,57--3,62),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/ObjectModelWithTwoMembers.fs (3,4--3,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/ObjectModelWithTwoMembers.fs (3,63--3,64) })),
+                         /root/ObjectModelWithTwoMembers.fs (3,4--3,79),
+                         { InlineKeyword = None
+                           WithKeyword =
+                            /root/ObjectModelWithTwoMembers.fs (3,30--3,34)
+                           GetKeyword =
+                            Some /root/ObjectModelWithTwoMembers.fs (3,35--3,38)
+                           AndKeyword =
+                            Some /root/ObjectModelWithTwoMembers.fs (3,53--3,56)
+                           SetKeyword =
+                            Some /root/ObjectModelWithTwoMembers.fs (3,57--3,60) })],
+                     /root/ObjectModelWithTwoMembers.fs (2,4--3,79)), [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([], /root/ObjectModelWithTwoMembers.fs (1,6--1,8)),
+                        None,
+                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/ObjectModelWithTwoMembers.fs (1,5--1,6),
+                        { AsKeyword = None })),
+                  /root/ObjectModelWithTwoMembers.fs (1,5--3,79),
+                  { LeadingKeyword =
+                     Type /root/ObjectModelWithTwoMembers.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/ObjectModelWithTwoMembers.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/ObjectModelWithTwoMembers.fs (1,0--3,79))], PreXmlDocEmpty,
+          [], None, /root/ObjectModelWithTwoMembers.fs (1,0--3,79),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorAsFunction.fs b/tests/service/data/SyntaxTree/OperatorAsFunction.fs
new file mode 100644
index 00000000000..3d80bba5cbc
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorAsFunction.fs
@@ -0,0 +1 @@
+(+) 3 4
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorAsFunction.fs.bsl
new file mode 100644
index 00000000000..4ef95d3ca3c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorAsFunction.fs.bsl
@@ -0,0 +1,28 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorAsFunction.fs", false,
+      QualifiedNameOfFile OperatorAsFunction, [], [],
+      [SynModuleOrNamespace
+         ([OperatorAsFunction], false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false,
+                 App
+                   (NonAtomic, false,
+                    LongIdent
+                      (false,
+                       SynLongIdent
+                         ([op_Addition], [],
+                          [Some
+                             (OriginalNotationWithParen
+                                (/root/OperatorAsFunction.fs (1,0--1,1), "+",
+                                 /root/OperatorAsFunction.fs (1,2--1,3)))]),
+                       None, /root/OperatorAsFunction.fs (1,0--1,3)),
+                    Const (Int32 3, /root/OperatorAsFunction.fs (1,4--1,5)),
+                    /root/OperatorAsFunction.fs (1,0--1,5)),
+                 Const (Int32 4, /root/OperatorAsFunction.fs (1,6--1,7)),
+                 /root/OperatorAsFunction.fs (1,0--1,7)),
+              /root/OperatorAsFunction.fs (1,0--1,7))], PreXmlDocEmpty, [], None,
+          /root/OperatorAsFunction.fs (1,0--1,7), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs b/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs
new file mode 100644
index 00000000000..9d6f38107b5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs
@@ -0,0 +1,2 @@
+match x with
+| (head) :: (tail) -> ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs.bsl b/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs.bsl
new file mode 100644
index 00000000000..13884d036e0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs.bsl
@@ -0,0 +1,38 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorInMatchPattern.fs", false,
+      QualifiedNameOfFile OperatorInMatchPattern, [], [],
+      [SynModuleOrNamespace
+         ([OperatorInMatchPattern], false, AnonModule,
+          [Expr
+             (Match
+                (Yes /root/OperatorInMatchPattern.fs (1,0--1,12), Ident x,
+                 [SynMatchClause
+                    (ListCons
+                       (Paren
+                          (Named
+                             (SynIdent (head, None), false, None,
+                              /root/OperatorInMatchPattern.fs (2,3--2,7)),
+                           /root/OperatorInMatchPattern.fs (2,2--2,8)),
+                        Paren
+                          (Named
+                             (SynIdent (tail, None), false, None,
+                              /root/OperatorInMatchPattern.fs (2,13--2,17)),
+                           /root/OperatorInMatchPattern.fs (2,12--2,18)),
+                        /root/OperatorInMatchPattern.fs (2,2--2,18),
+                        { ColonColonRange =
+                           /root/OperatorInMatchPattern.fs (2,9--2,11) }), None,
+                     Const (Unit, /root/OperatorInMatchPattern.fs (2,22--2,24)),
+                     /root/OperatorInMatchPattern.fs (2,2--2,24), Yes,
+                     { ArrowRange =
+                        Some /root/OperatorInMatchPattern.fs (2,19--2,21)
+                       BarRange =
+                        Some /root/OperatorInMatchPattern.fs (2,0--2,1) })],
+                 /root/OperatorInMatchPattern.fs (1,0--2,24),
+                 { MatchKeyword = /root/OperatorInMatchPattern.fs (1,0--1,5)
+                   WithKeyword = /root/OperatorInMatchPattern.fs (1,8--1,12) }),
+              /root/OperatorInMatchPattern.fs (1,0--2,24))], PreXmlDocEmpty, [],
+          None, /root/OperatorInMatchPattern.fs (1,0--2,24),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs b/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs
new file mode 100644
index 00000000000..81c72307d5b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs
@@ -0,0 +1,2 @@
+type X with
+    member _.(+) a b = a + b
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs.bsl
new file mode 100644
index 00000000000..e9e405bef08
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs.bsl
@@ -0,0 +1,87 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorInMemberDefinition.fs", false,
+      QualifiedNameOfFile OperatorInMemberDefinition, [], [],
+      [SynModuleOrNamespace
+         ([OperatorInMemberDefinition], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/OperatorInMemberDefinition.fs (1,5--1,6)),
+                  ObjectModel
+                    (Augmentation
+                       /root/OperatorInMemberDefinition.fs (1,7--1,11), [],
+                     /root/OperatorInMemberDefinition.fs (1,5--2,28)),
+                  [Member
+                     (SynBinding
+                        (None, Normal, false, false, [],
+                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         SynValData
+                           (Some { IsInstance = true
+                                   IsDispatchSlot = false
+                                   IsOverrideOrExplicitImpl = false
+                                   IsFinal = false
+                                   GetterOrSetterIsCompilerGenerated = false
+                                   MemberKind = Member },
+                            SynValInfo
+                              ([[SynArgInfo ([], false, None)];
+                                [SynArgInfo ([], false, Some a)];
+                                [SynArgInfo ([], false, Some b)]],
+                               SynArgInfo ([], false, None)), None),
+                         LongIdent
+                           (SynLongIdent
+                              ([_; op_Addition],
+                               [/root/OperatorInMemberDefinition.fs (2,12--2,13)],
+                               [None;
+                                Some
+                                  (OriginalNotationWithParen
+                                     (/root/OperatorInMemberDefinition.fs (2,13--2,14),
+                                      "+",
+                                      /root/OperatorInMemberDefinition.fs (2,15--2,16)))]),
+                            None, None,
+                            Pats
+                              [Named
+                                 (SynIdent (a, None), false, None,
+                                  /root/OperatorInMemberDefinition.fs (2,17--2,18));
+                               Named
+                                 (SynIdent (b, None), false, None,
+                                  /root/OperatorInMemberDefinition.fs (2,19--2,20))],
+                            None,
+                            /root/OperatorInMemberDefinition.fs (2,11--2,20)),
+                         None,
+                         App
+                           (NonAtomic, false,
+                            App
+                              (NonAtomic, true,
+                               LongIdent
+                                 (false,
+                                  SynLongIdent
+                                    ([op_Addition], [],
+                                     [Some (OriginalNotation "+")]), None,
+                                  /root/OperatorInMemberDefinition.fs (2,25--2,26)),
+                               Ident a,
+                               /root/OperatorInMemberDefinition.fs (2,23--2,26)),
+                            Ident b,
+                            /root/OperatorInMemberDefinition.fs (2,23--2,28)),
+                         /root/OperatorInMemberDefinition.fs (2,11--2,20),
+                         NoneAtInvisible,
+                         { LeadingKeyword =
+                            Member
+                              /root/OperatorInMemberDefinition.fs (2,4--2,10)
+                           InlineKeyword = None
+                           EqualsRange =
+                            Some
+                              /root/OperatorInMemberDefinition.fs (2,21--2,22) }),
+                      /root/OperatorInMemberDefinition.fs (2,4--2,28))], None,
+                  /root/OperatorInMemberDefinition.fs (1,5--2,28),
+                  { LeadingKeyword =
+                     Type /root/OperatorInMemberDefinition.fs (1,0--1,4)
+                    EqualsRange = None
+                    WithKeyword = None })],
+              /root/OperatorInMemberDefinition.fs (1,0--2,28))], PreXmlDocEmpty,
+          [], None, /root/OperatorInMemberDefinition.fs (1,0--2,28),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs b/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs
new file mode 100644
index 00000000000..4ca72f39712
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs
@@ -0,0 +1 @@
+let (head::tail) =  [ 1;2;4]
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs.bsl b/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs.bsl
new file mode 100644
index 00000000000..20dab8271cf
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs.bsl
@@ -0,0 +1,55 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorInSynPatLongIdent.fs", false,
+      QualifiedNameOfFile OperatorInSynPatLongIdent, [], [],
+      [SynModuleOrNamespace
+         ([OperatorInSynPatLongIdent], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Paren
+                    (ListCons
+                       (Named
+                          (SynIdent (head, None), false, None,
+                           /root/OperatorInSynPatLongIdent.fs (1,5--1,9)),
+                        Named
+                          (SynIdent (tail, None), false, None,
+                           /root/OperatorInSynPatLongIdent.fs (1,11--1,15)),
+                        /root/OperatorInSynPatLongIdent.fs (1,5--1,15),
+                        { ColonColonRange =
+                           /root/OperatorInSynPatLongIdent.fs (1,9--1,11) }),
+                     /root/OperatorInSynPatLongIdent.fs (1,4--1,16)), None,
+                  ArrayOrListComputed
+                    (false,
+                     Sequential
+                       (SuppressNeither, true,
+                        Const
+                          (Int32 1,
+                           /root/OperatorInSynPatLongIdent.fs (1,22--1,23)),
+                        Sequential
+                          (SuppressNeither, true,
+                           Const
+                             (Int32 2,
+                              /root/OperatorInSynPatLongIdent.fs (1,24--1,25)),
+                           Const
+                             (Int32 4,
+                              /root/OperatorInSynPatLongIdent.fs (1,26--1,27)),
+                           /root/OperatorInSynPatLongIdent.fs (1,24--1,27)),
+                        /root/OperatorInSynPatLongIdent.fs (1,22--1,27)),
+                     /root/OperatorInSynPatLongIdent.fs (1,20--1,28)),
+                  /root/OperatorInSynPatLongIdent.fs (1,4--1,16),
+                  Yes /root/OperatorInSynPatLongIdent.fs (1,0--1,28),
+                  { LeadingKeyword =
+                     Let /root/OperatorInSynPatLongIdent.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some /root/OperatorInSynPatLongIdent.fs (1,17--1,18) })],
+              /root/OperatorInSynPatLongIdent.fs (1,0--1,28))], PreXmlDocEmpty,
+          [], None, /root/OperatorInSynPatLongIdent.fs (1,0--1,28),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi b/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi
new file mode 100644
index 00000000000..1953fc21a11
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi
@@ -0,0 +1,2 @@
+module IntrinsicOperators
+val (&): e1: bool -> e2: bool -> bool
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi.bsl b/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi.bsl
new file mode 100644
index 00000000000..f6498034a37
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi.bsl
@@ -0,0 +1,50 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/OperatorNameInSynValSig.fsi",
+      QualifiedNameOfFile IntrinsicOperators, [], [],
+      [SynModuleOrNamespaceSig
+         ([IntrinsicOperators], false, NamedModule,
+          [Val
+             (SynValSig
+                ([],
+                 SynIdent
+                   (op_Amp,
+                    Some
+                      (OriginalNotationWithParen
+                         (/root/OperatorNameInSynValSig.fsi (2,4--2,5), "&",
+                          /root/OperatorNameInSynValSig.fsi (2,6--2,7)))),
+                 SynValTyparDecls (None, true),
+                 Fun
+                   (SignatureParameter
+                      ([], false, Some e1,
+                       LongIdent (SynLongIdent ([bool], [], [None])),
+                       /root/OperatorNameInSynValSig.fsi (2,9--2,17)),
+                    Fun
+                      (SignatureParameter
+                         ([], false, Some e2,
+                          LongIdent (SynLongIdent ([bool], [], [None])),
+                          /root/OperatorNameInSynValSig.fsi (2,21--2,29)),
+                       LongIdent (SynLongIdent ([bool], [], [None])),
+                       /root/OperatorNameInSynValSig.fsi (2,21--2,37),
+                       { ArrowRange =
+                          /root/OperatorNameInSynValSig.fsi (2,30--2,32) }),
+                    /root/OperatorNameInSynValSig.fsi (2,9--2,37),
+                    { ArrowRange =
+                       /root/OperatorNameInSynValSig.fsi (2,18--2,20) }),
+                 SynValInfo
+                   ([[SynArgInfo ([], false, Some e1)];
+                     [SynArgInfo ([], false, Some e2)]],
+                    SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None, /root/OperatorNameInSynValSig.fsi (2,0--2,37),
+                 { LeadingKeyword =
+                    Val /root/OperatorNameInSynValSig.fsi (2,0--2,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange = None }),
+              /root/OperatorNameInSynValSig.fsi (2,0--2,37))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/OperatorNameInSynValSig.fsi (1,0--2,37),
+          { LeadingKeyword = Module /root/OperatorNameInSynValSig.fsi (1,0--1,6) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi b/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi
new file mode 100644
index 00000000000..93f93a27ade
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi
@@ -0,0 +1,11 @@
+[<AutoOpen>]
+    module Operators
+    /// <summary>Overloaded unary negation.</summary>
+    ///
+    /// <param name="n">The value to negate.</param>
+    ///
+    /// <returns>The result of the operation.</returns>
+    /// 
+    /// <example-tbd></example-tbd>
+    /// 
+    val inline (~-): n: ^T -> ^T when ^T: (static member ( ~- ): ^T -> ^T) and default ^T: int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi.bsl b/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi.bsl
new file mode 100644
index 00000000000..0d6c956a9fc
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi.bsl
@@ -0,0 +1,110 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/OperatorNameInValConstraint.fsi", QualifiedNameOfFile Operators, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([Operators], false, NamedModule,
+          [Val
+             (SynValSig
+                ([],
+                 SynIdent
+                   (op_UnaryNegation,
+                    Some
+                      (OriginalNotationWithParen
+                         (/root/OperatorNameInValConstraint.fsi (11,15--11,16),
+                          "~-",
+                          /root/OperatorNameInValConstraint.fsi (11,18--11,19)))),
+                 SynValTyparDecls (None, true),
+                 WithGlobalConstraints
+                   (Fun
+                      (SignatureParameter
+                         ([], false, Some n,
+                          Var
+                            (SynTypar (T, HeadType, false),
+                             /root/OperatorNameInValConstraint.fsi (11,24--11,26)),
+                          /root/OperatorNameInValConstraint.fsi (11,21--11,26)),
+                       Var
+                         (SynTypar (T, HeadType, false),
+                          /root/OperatorNameInValConstraint.fsi (11,30--11,32)),
+                       /root/OperatorNameInValConstraint.fsi (11,21--11,32),
+                       { ArrowRange =
+                          /root/OperatorNameInValConstraint.fsi (11,27--11,29) }),
+                    [WhereTyparSupportsMember
+                       (Var
+                          (SynTypar (T, HeadType, false),
+                           /root/OperatorNameInValConstraint.fsi (11,38--11,40)),
+                        Member
+                          (SynValSig
+                             ([],
+                              SynIdent
+                                (op_UnaryNegation,
+                                 Some
+                                   (OriginalNotationWithParen
+                                      (/root/OperatorNameInValConstraint.fsi (11,57--11,58),
+                                       "~-",
+                                       /root/OperatorNameInValConstraint.fsi (11,62--11,63)))),
+                              SynValTyparDecls (None, true),
+                              Fun
+                                (Var
+                                   (SynTypar (T, HeadType, false),
+                                    /root/OperatorNameInValConstraint.fsi (11,65--11,67)),
+                                 Var
+                                   (SynTypar (T, HeadType, false),
+                                    /root/OperatorNameInValConstraint.fsi (11,71--11,73)),
+                                 /root/OperatorNameInValConstraint.fsi (11,65--11,73),
+                                 { ArrowRange =
+                                    /root/OperatorNameInValConstraint.fsi (11,68--11,70) }),
+                              SynValInfo
+                                ([[SynArgInfo ([], false, None)]],
+                                 SynArgInfo ([], false, None)), false, false,
+                              PreXmlDoc ((11,43), FSharp.Compiler.Xml.XmlDocCollector),
+                              None, None,
+                              /root/OperatorNameInValConstraint.fsi (11,43--11,73),
+                              { LeadingKeyword =
+                                 StaticMember
+                                   (/root/OperatorNameInValConstraint.fsi (11,43--11,49),
+                                    /root/OperatorNameInValConstraint.fsi (11,50--11,56))
+                                InlineKeyword = None
+                                WithKeyword = None
+                                EqualsRange = None }),
+                           { IsInstance = false
+                             IsDispatchSlot = false
+                             IsOverrideOrExplicitImpl = false
+                             IsFinal = false
+                             GetterOrSetterIsCompilerGenerated = false
+                             MemberKind = Member },
+                           /root/OperatorNameInValConstraint.fsi (11,43--11,73),
+                           { GetSetKeywords = None }),
+                        /root/OperatorNameInValConstraint.fsi (11,38--11,74));
+                     WhereTyparDefaultsToType
+                       (SynTypar (T, HeadType, false),
+                        LongIdent (SynLongIdent ([int], [], [None])),
+                        /root/OperatorNameInValConstraint.fsi (11,79--11,94))],
+                    /root/OperatorNameInValConstraint.fsi (11,21--11,94)),
+                 SynValInfo
+                   ([[SynArgInfo ([], false, Some n)]],
+                    SynArgInfo ([], false, None)), true, false,
+                 PreXmlDoc ((11,4), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None, /root/OperatorNameInValConstraint.fsi (3,4--11,94),
+                 { LeadingKeyword =
+                    Val /root/OperatorNameInValConstraint.fsi (11,4--11,7)
+                   InlineKeyword =
+                    Some /root/OperatorNameInValConstraint.fsi (11,8--11,14)
+                   WithKeyword = None
+                   EqualsRange = None }),
+              /root/OperatorNameInValConstraint.fsi (3,4--11,94))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+          [{ Attributes =
+              [{ TypeName = SynLongIdent ([AutoOpen], [], [None])
+                 ArgExpr =
+                  Const
+                    (Unit, /root/OperatorNameInValConstraint.fsi (1,2--1,10))
+                 Target = None
+                 AppliesToGetterAndSetter = false
+                 Range = /root/OperatorNameInValConstraint.fsi (1,2--1,10) }]
+             Range = /root/OperatorNameInValConstraint.fsi (1,0--1,12) }], None,
+          /root/OperatorNameInValConstraint.fsi (1,0--11,94),
+          { LeadingKeyword =
+             Module /root/OperatorNameInValConstraint.fsi (2,4--2,10) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OptionalExpression.fs b/tests/service/data/SyntaxTree/OptionalExpression.fs
new file mode 100644
index 00000000000..afdbba5bdc6
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OptionalExpression.fs
@@ -0,0 +1 @@
+f(?x = 7)
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OptionalExpression.fs.bsl b/tests/service/data/SyntaxTree/OptionalExpression.fs.bsl
new file mode 100644
index 00000000000..55b57e52d06
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OptionalExpression.fs.bsl
@@ -0,0 +1,33 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OptionalExpression.fs", false,
+      QualifiedNameOfFile OptionalExpression, [], [],
+      [SynModuleOrNamespace
+         ([OptionalExpression], false, AnonModule,
+          [Expr
+             (App
+                (Atomic, false, Ident f,
+                 Paren
+                   (App
+                      (NonAtomic, false,
+                       App
+                         (NonAtomic, true,
+                          LongIdent
+                            (false,
+                             SynLongIdent
+                               ([op_Equality], [], [Some (OriginalNotation "=")]),
+                             None, /root/OptionalExpression.fs (1,5--1,6)),
+                          LongIdent
+                            (true, SynLongIdent ([x], [], [None]), None,
+                             /root/OptionalExpression.fs (1,3--1,4)),
+                          /root/OptionalExpression.fs (1,3--1,6)),
+                       Const (Int32 7, /root/OptionalExpression.fs (1,7--1,8)),
+                       /root/OptionalExpression.fs (1,3--1,8)),
+                    /root/OptionalExpression.fs (1,1--1,2),
+                    Some /root/OptionalExpression.fs (1,8--1,9),
+                    /root/OptionalExpression.fs (1,1--1,9)),
+                 /root/OptionalExpression.fs (1,0--1,9)),
+              /root/OptionalExpression.fs (1,0--1,9))], PreXmlDocEmpty, [], None,
+          /root/OptionalExpression.fs (1,0--1,9), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OverrideKeyword.fs b/tests/service/data/SyntaxTree/OverrideKeyword.fs
new file mode 100644
index 00000000000..87e15e92940
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OverrideKeyword.fs
@@ -0,0 +1,2 @@
+type D =
+    override E : string = ""
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OverrideKeyword.fs.bsl b/tests/service/data/SyntaxTree/OverrideKeyword.fs.bsl
new file mode 100644
index 00000000000..83faaa0bc56
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OverrideKeyword.fs.bsl
@@ -0,0 +1,64 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OverrideKeyword.fs", false, QualifiedNameOfFile OverrideKeyword, [],
+      [],
+      [SynModuleOrNamespace
+         ([OverrideKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [D],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/OverrideKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = true
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent ([E], [], [None]), None, None,
+                               Pats [], None,
+                               /root/OverrideKeyword.fs (2,13--2,14)),
+                            Some
+                              (SynBindingReturnInfo
+                                 (LongIdent
+                                    (SynLongIdent ([string], [], [None])),
+                                  /root/OverrideKeyword.fs (2,17--2,23), [],
+                                  { ColonRange =
+                                     Some /root/OverrideKeyword.fs (2,15--2,16) })),
+                            Typed
+                              (Const
+                                 (String
+                                    ("", Regular,
+                                     /root/OverrideKeyword.fs (2,26--2,28)),
+                                  /root/OverrideKeyword.fs (2,26--2,28)),
+                               LongIdent (SynLongIdent ([string], [], [None])),
+                               /root/OverrideKeyword.fs (2,26--2,28)),
+                            /root/OverrideKeyword.fs (2,13--2,14),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Override /root/OverrideKeyword.fs (2,4--2,12)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some /root/OverrideKeyword.fs (2,24--2,25) }),
+                         /root/OverrideKeyword.fs (2,4--2,28))],
+                     /root/OverrideKeyword.fs (2,4--2,28)), [], None,
+                  /root/OverrideKeyword.fs (1,5--2,28),
+                  { LeadingKeyword = Type /root/OverrideKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/OverrideKeyword.fs (1,7--1,8)
+                    WithKeyword = None })], /root/OverrideKeyword.fs (1,0--2,28))],
+          PreXmlDocEmpty, [], None, /root/OverrideKeyword.fs (1,0--2,28),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OverrideValKeyword.fs b/tests/service/data/SyntaxTree/OverrideValKeyword.fs
new file mode 100644
index 00000000000..15887ca939b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OverrideValKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    override val Y : int = 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OverrideValKeyword.fs.bsl b/tests/service/data/SyntaxTree/OverrideValKeyword.fs.bsl
new file mode 100644
index 00000000000..c7b385e06e3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OverrideValKeyword.fs.bsl
@@ -0,0 +1,52 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OverrideValKeyword.fs", false,
+      QualifiedNameOfFile OverrideValKeyword, [], [],
+      [SynModuleOrNamespace
+         ([OverrideValKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/OverrideValKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [AutoProperty
+                        ([], false, Y,
+                         Some (LongIdent (SynLongIdent ([int], [], [None]))),
+                         Member, { IsInstance = true
+                                   IsDispatchSlot = false
+                                   IsOverrideOrExplicitImpl = true
+                                   IsFinal = false
+                                   GetterOrSetterIsCompilerGenerated = false
+                                   MemberKind = Member },
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = true
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertySet },
+                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None,
+                         Const
+                           (Int32 1, /root/OverrideValKeyword.fs (2,27--2,28)),
+                         /root/OverrideValKeyword.fs (2,4--2,28),
+                         { LeadingKeyword =
+                            OverrideVal
+                              (/root/OverrideValKeyword.fs (2,4--2,12),
+                               /root/OverrideValKeyword.fs (2,13--2,16))
+                           WithKeyword = None
+                           EqualsRange =
+                            Some /root/OverrideValKeyword.fs (2,25--2,26)
+                           GetSetKeywords = None })],
+                     /root/OverrideValKeyword.fs (2,4--2,28)), [], None,
+                  /root/OverrideValKeyword.fs (1,5--2,28),
+                  { LeadingKeyword = Type /root/OverrideValKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/OverrideValKeyword.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/OverrideValKeyword.fs (1,0--2,28))], PreXmlDocEmpty, [],
+          None, /root/OverrideValKeyword.fs (1,0--2,28),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs b/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs
new file mode 100644
index 00000000000..6d96fbb0b8e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs
@@ -0,0 +1,5 @@
+match data with
+| OnePartData( // foo
+    part1 = p1
+  (* bar *) ) -> p1
+| _ -> failwith "todo"
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl b/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
new file mode 100644
index 00000000000..25425a5a412
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
@@ -0,0 +1,67 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ParenthesesOfSynArgPatsNamePatPairs.fs", false,
+      QualifiedNameOfFile ParenthesesOfSynArgPatsNamePatPairs, [], [],
+      [SynModuleOrNamespace
+         ([ParenthesesOfSynArgPatsNamePatPairs], false, AnonModule,
+          [Expr
+             (Match
+                (Yes /root/ParenthesesOfSynArgPatsNamePatPairs.fs (1,0--1,15),
+                 Ident data,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([OnePartData], [], [None]), None, None,
+                        NamePatPairs
+                          ([(part1,
+                             /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,10--3,11),
+                             Named
+                               (SynIdent (p1, None), false, None,
+                                /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,12--3,14)))],
+                           /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,4--4,13),
+                           { ParenRange =
+                              /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,13--4,13) }),
+                        None,
+                        /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,2--4,13)),
+                     None, Ident p1,
+                     /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,2--4,19),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (4,14--4,16)
+                       BarRange =
+                        Some
+                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--2,1) });
+                  SynMatchClause
+                    (Wild
+                       /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,2--5,3),
+                     None,
+                     App
+                       (NonAtomic, false, Ident failwith,
+                        Const
+                          (String
+                             ("todo", Regular,
+                              /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,16--5,22)),
+                           /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,16--5,22)),
+                        /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,7--5,22)),
+                     /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,2--5,22),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,4--5,6)
+                       BarRange =
+                        Some
+                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,0--5,1) })],
+                 /root/ParenthesesOfSynArgPatsNamePatPairs.fs (1,0--5,22),
+                 { MatchKeyword =
+                    /root/ParenthesesOfSynArgPatsNamePatPairs.fs (1,0--1,5)
+                   WithKeyword =
+                    /root/ParenthesesOfSynArgPatsNamePatPairs.fs (1,11--1,15) }),
+              /root/ParenthesesOfSynArgPatsNamePatPairs.fs (1,0--5,22))],
+          PreXmlDocEmpty, [], None,
+          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (1,0--5,22),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,15--2,21);
+          BlockComment /root/ParenthesesOfSynArgPatsNamePatPairs.fs (4,2--4,11)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs b/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs
new file mode 100644
index 00000000000..60f6ff4e5cc
--- /dev/null
+++ b/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs
@@ -0,0 +1 @@
+(|Odd|_|) 4
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs.bsl
new file mode 100644
index 00000000000..e8ddbecd5af
--- /dev/null
+++ b/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs.bsl
@@ -0,0 +1,28 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/PartialActivePatternAsFunction.fs", false,
+      QualifiedNameOfFile PartialActivePatternAsFunction, [], [],
+      [SynModuleOrNamespace
+         ([PartialActivePatternAsFunction], false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false,
+                 LongIdent
+                   (false,
+                    SynLongIdent
+                      ([|Odd|_|], [],
+                       [Some
+                          (HasParenthesis
+                             (/root/PartialActivePatternAsFunction.fs (1,0--1,1),
+                              /root/PartialActivePatternAsFunction.fs (1,8--1,9)))]),
+                    None, /root/PartialActivePatternAsFunction.fs (1,0--1,9)),
+                 Const
+                   (Int32 4,
+                    /root/PartialActivePatternAsFunction.fs (1,10--1,11)),
+                 /root/PartialActivePatternAsFunction.fs (1,0--1,11)),
+              /root/PartialActivePatternAsFunction.fs (1,0--1,11))],
+          PreXmlDocEmpty, [], None,
+          /root/PartialActivePatternAsFunction.fs (1,0--1,11),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs b/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs
new file mode 100644
index 00000000000..782591fc09c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs
@@ -0,0 +1 @@
+let (|Int32Const|_|) (a: SynConst) = match a with SynConst.Int32 _ -> Some a | _ -> None
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs.bsl
new file mode 100644
index 00000000000..de7257b75e1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs.bsl
@@ -0,0 +1,88 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/PartialActivePatternDefinition.fs", false,
+      QualifiedNameOfFile PartialActivePatternDefinition, [], [],
+      [SynModuleOrNamespace
+         ([PartialActivePatternDefinition], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some a)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent
+                       ([|Int32Const|_|], [],
+                        [Some
+                           (HasParenthesis
+                              (/root/PartialActivePatternDefinition.fs (1,4--1,5),
+                               /root/PartialActivePatternDefinition.fs (1,19--1,20)))]),
+                     None, None,
+                     Pats
+                       [Paren
+                          (Typed
+                             (Named
+                                (SynIdent (a, None), false, None,
+                                 /root/PartialActivePatternDefinition.fs (1,22--1,23)),
+                              LongIdent (SynLongIdent ([SynConst], [], [None])),
+                              /root/PartialActivePatternDefinition.fs (1,22--1,33)),
+                           /root/PartialActivePatternDefinition.fs (1,21--1,34))],
+                     None, /root/PartialActivePatternDefinition.fs (1,4--1,34)),
+                  None,
+                  Match
+                    (Yes /root/PartialActivePatternDefinition.fs (1,37--1,49),
+                     Ident a,
+                     [SynMatchClause
+                        (LongIdent
+                           (SynLongIdent
+                              ([SynConst; Int32],
+                               [/root/PartialActivePatternDefinition.fs (1,58--1,59)],
+                               [None; None]), None, None,
+                            Pats
+                              [Wild
+                                 /root/PartialActivePatternDefinition.fs (1,65--1,66)],
+                            None,
+                            /root/PartialActivePatternDefinition.fs (1,50--1,66)),
+                         None,
+                         App
+                           (NonAtomic, false, Ident Some, Ident a,
+                            /root/PartialActivePatternDefinition.fs (1,70--1,76)),
+                         /root/PartialActivePatternDefinition.fs (1,50--1,76),
+                         Yes,
+                         { ArrowRange =
+                            Some
+                              /root/PartialActivePatternDefinition.fs (1,67--1,69)
+                           BarRange = None });
+                      SynMatchClause
+                        (Wild
+                           /root/PartialActivePatternDefinition.fs (1,79--1,80),
+                         None, Ident None,
+                         /root/PartialActivePatternDefinition.fs (1,79--1,88),
+                         Yes,
+                         { ArrowRange =
+                            Some
+                              /root/PartialActivePatternDefinition.fs (1,81--1,83)
+                           BarRange =
+                            Some
+                              /root/PartialActivePatternDefinition.fs (1,77--1,78) })],
+                     /root/PartialActivePatternDefinition.fs (1,37--1,88),
+                     { MatchKeyword =
+                        /root/PartialActivePatternDefinition.fs (1,37--1,42)
+                       WithKeyword =
+                        /root/PartialActivePatternDefinition.fs (1,45--1,49) }),
+                  /root/PartialActivePatternDefinition.fs (1,4--1,34), NoneAtLet,
+                  { LeadingKeyword =
+                     Let /root/PartialActivePatternDefinition.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some /root/PartialActivePatternDefinition.fs (1,35--1,36) })],
+              /root/PartialActivePatternDefinition.fs (1,0--1,88))],
+          PreXmlDocEmpty, [], None,
+          /root/PartialActivePatternDefinition.fs (1,0--1,88),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs b/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs
new file mode 100644
index 00000000000..0ad0f1677ec
--- /dev/null
+++ b/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs
@@ -0,0 +1 @@
+let (|Boolean|_|) = Boolean.parse
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs.bsl b/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs.bsl
new file mode 100644
index 00000000000..4b10e5c2360
--- /dev/null
+++ b/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs.bsl
@@ -0,0 +1,47 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/PartialActivePatternDefinitionWithoutParameters.fs", false,
+      QualifiedNameOfFile PartialActivePatternDefinitionWithoutParameters, [],
+      [],
+      [SynModuleOrNamespace
+         ([PartialActivePatternDefinitionWithoutParameters], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent
+                       (|Boolean|_|,
+                        Some
+                          (HasParenthesis
+                             (/root/PartialActivePatternDefinitionWithoutParameters.fs (1,4--1,5),
+                              /root/PartialActivePatternDefinitionWithoutParameters.fs (1,16--1,17)))),
+                     false, None,
+                     /root/PartialActivePatternDefinitionWithoutParameters.fs (1,5--1,16)),
+                  None,
+                  LongIdent
+                    (false,
+                     SynLongIdent
+                       ([Boolean; parse],
+                        [/root/PartialActivePatternDefinitionWithoutParameters.fs (1,27--1,28)],
+                        [None; None]), None,
+                     /root/PartialActivePatternDefinitionWithoutParameters.fs (1,20--1,33)),
+                  /root/PartialActivePatternDefinitionWithoutParameters.fs (1,4--1,17),
+                  Yes
+                    /root/PartialActivePatternDefinitionWithoutParameters.fs (1,0--1,33),
+                  { LeadingKeyword =
+                     Let
+                       /root/PartialActivePatternDefinitionWithoutParameters.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/PartialActivePatternDefinitionWithoutParameters.fs (1,18--1,19) })],
+              /root/PartialActivePatternDefinitionWithoutParameters.fs (1,0--1,33))],
+          PreXmlDocEmpty, [], None,
+          /root/PartialActivePatternDefinitionWithoutParameters.fs (1,0--1,33),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrefixOperation.fs b/tests/service/data/SyntaxTree/PrefixOperation.fs
new file mode 100644
index 00000000000..4005c82dd55
--- /dev/null
+++ b/tests/service/data/SyntaxTree/PrefixOperation.fs
@@ -0,0 +1 @@
++ -86
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrefixOperation.fs.bsl b/tests/service/data/SyntaxTree/PrefixOperation.fs.bsl
new file mode 100644
index 00000000000..e1f7ae93b4d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/PrefixOperation.fs.bsl
@@ -0,0 +1,20 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/PrefixOperation.fs", false, QualifiedNameOfFile PrefixOperation, [],
+      [],
+      [SynModuleOrNamespace
+         ([PrefixOperation], false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false,
+                 LongIdent
+                   (false,
+                    SynLongIdent
+                      ([op_UnaryPlus], [], [Some (OriginalNotation "+")]), None,
+                    /root/PrefixOperation.fs (1,0--1,1)),
+                 Const (Int32 -86, /root/PrefixOperation.fs (1,2--1,5)),
+                 /root/PrefixOperation.fs (1,0--1,5)),
+              /root/PrefixOperation.fs (1,0--1,5))], PreXmlDocEmpty, [], None,
+          /root/PrefixOperation.fs (1,0--1,5), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs b/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs
new file mode 100644
index 00000000000..42255ea1d43
--- /dev/null
+++ b/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs
@@ -0,0 +1 @@
+%%arg
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs.bsl b/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs.bsl
new file mode 100644
index 00000000000..fadf60849ae
--- /dev/null
+++ b/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs.bsl
@@ -0,0 +1,21 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/PrefixOperationWithTwoCharacters.fs", false,
+      QualifiedNameOfFile PrefixOperationWithTwoCharacters, [], [],
+      [SynModuleOrNamespace
+         ([PrefixOperationWithTwoCharacters], false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false,
+                 LongIdent
+                   (false,
+                    SynLongIdent
+                      ([op_SpliceUntyped], [], [Some (OriginalNotation "%%")]),
+                    None, /root/PrefixOperationWithTwoCharacters.fs (1,0--1,2)),
+                 Ident arg, /root/PrefixOperationWithTwoCharacters.fs (1,0--1,5)),
+              /root/PrefixOperationWithTwoCharacters.fs (1,0--1,5))],
+          PreXmlDocEmpty, [], None,
+          /root/PrefixOperationWithTwoCharacters.fs (1,0--1,5),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs b/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs
new file mode 100644
index 00000000000..b18d97c9855
--- /dev/null
+++ b/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs
@@ -0,0 +1,8 @@
+type Currency =
+    // Temporary fix until a new Thoth.Json.Net package is released
+    // See https://github.com/MangelMaxime/Thoth/pull/70
+
+#if !FABLE_COMPILER
+    private
+#endif
+    | Code of string
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs.bsl b/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs.bsl
new file mode 100644
index 00000000000..21ce3499a43
--- /dev/null
+++ b/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs.bsl
@@ -0,0 +1,50 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/PrivateKeywordHasRange.fs", false,
+      QualifiedNameOfFile PrivateKeywordHasRange, [], [],
+      [SynModuleOrNamespace
+         ([PrivateKeywordHasRange], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Currency],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/PrivateKeywordHasRange.fs (1,5--1,13)),
+                  Simple
+                    (Union
+                       (Some
+                          (Private /root/PrivateKeywordHasRange.fs (6,4--6,11)),
+                        [SynUnionCase
+                           ([], SynIdent (Code, None),
+                            Fields
+                              [SynField
+                                 ([], false, None,
+                                  LongIdent
+                                    (SynLongIdent ([string], [], [None])), false,
+                                  PreXmlDoc ((8,14), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/PrivateKeywordHasRange.fs (8,14--8,20),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((8,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, /root/PrivateKeywordHasRange.fs (8,6--8,20),
+                            { BarRange =
+                               Some /root/PrivateKeywordHasRange.fs (8,4--8,5) })],
+                        /root/PrivateKeywordHasRange.fs (6,4--8,20)),
+                     /root/PrivateKeywordHasRange.fs (6,4--8,20)), [], None,
+                  /root/PrivateKeywordHasRange.fs (1,5--8,20),
+                  { LeadingKeyword =
+                     Type /root/PrivateKeywordHasRange.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/PrivateKeywordHasRange.fs (1,14--1,15)
+                    WithKeyword = None })],
+              /root/PrivateKeywordHasRange.fs (1,0--8,20))], PreXmlDocEmpty, [],
+          None, /root/PrivateKeywordHasRange.fs (1,0--8,20),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives =
+         [If
+            (Not (Ident "FABLE_COMPILER"),
+             /root/PrivateKeywordHasRange.fs (5,0--5,19));
+          EndIf /root/PrivateKeywordHasRange.fs (7,0--7,6)]
+        CodeComments =
+         [LineComment /root/PrivateKeywordHasRange.fs (2,4--2,67);
+          LineComment /root/PrivateKeywordHasRange.fs (3,4--3,56)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs b/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs
new file mode 100644
index 00000000000..6070ad71ee2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs
@@ -0,0 +1 @@
+let PowByte (x:byte) n = Checked.( * ) x
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs.bsl b/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs.bsl
new file mode 100644
index 00000000000..65c9a9a6013
--- /dev/null
+++ b/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs.bsl
@@ -0,0 +1,59 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/QualifiedOperatorExpression.fs", false,
+      QualifiedNameOfFile QualifiedOperatorExpression, [], [],
+      [SynModuleOrNamespace
+         ([QualifiedOperatorExpression], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some x)];
+                         [SynArgInfo ([], false, Some n)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([PowByte], [], [None]), None, None,
+                     Pats
+                       [Paren
+                          (Typed
+                             (Named
+                                (SynIdent (x, None), false, None,
+                                 /root/QualifiedOperatorExpression.fs (1,13--1,14)),
+                              LongIdent (SynLongIdent ([byte], [], [None])),
+                              /root/QualifiedOperatorExpression.fs (1,13--1,19)),
+                           /root/QualifiedOperatorExpression.fs (1,12--1,20));
+                        Named
+                          (SynIdent (n, None), false, None,
+                           /root/QualifiedOperatorExpression.fs (1,21--1,22))],
+                     None, /root/QualifiedOperatorExpression.fs (1,4--1,22)),
+                  None,
+                  App
+                    (NonAtomic, false,
+                     LongIdent
+                       (false,
+                        SynLongIdent
+                          ([Checked; op_Multiply],
+                           [/root/QualifiedOperatorExpression.fs (1,32--1,33)],
+                           [None;
+                            Some
+                              (OriginalNotationWithParen
+                                 (/root/QualifiedOperatorExpression.fs (1,33--1,34),
+                                  "*",
+                                  /root/QualifiedOperatorExpression.fs (1,37--1,38)))]),
+                        None, /root/QualifiedOperatorExpression.fs (1,25--1,38)),
+                     Ident x, /root/QualifiedOperatorExpression.fs (1,25--1,40)),
+                  /root/QualifiedOperatorExpression.fs (1,4--1,22), NoneAtLet,
+                  { LeadingKeyword =
+                     Let /root/QualifiedOperatorExpression.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some /root/QualifiedOperatorExpression.fs (1,23--1,24) })],
+              /root/QualifiedOperatorExpression.fs (1,0--1,40))], PreXmlDocEmpty,
+          [], None, /root/QualifiedOperatorExpression.fs (1,0--1,40),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi b/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi
new file mode 100644
index 00000000000..830b8557180
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi
@@ -0,0 +1,3 @@
+namespace Foobar
+
+type Bar = | Bar of string * int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl b/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
new file mode 100644
index 00000000000..951f594cfcd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
@@ -0,0 +1,61 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi",
+      QualifiedNameOfFile RangeMemberReturnsRangeOfSynModuleOrNamespaceSig, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([Foobar], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Bar],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,5--3,8)),
+                  Simple
+                    (Union
+                       (None,
+                        [SynUnionCase
+                           ([], SynIdent (Bar, None),
+                            Fields
+                              [SynField
+                                 ([], false, None,
+                                  LongIdent
+                                    (SynLongIdent ([string], [], [None])), false,
+                                  PreXmlDoc ((3,20), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,20--3,26),
+                                  { LeadingKeyword = None });
+                               SynField
+                                 ([], false, None,
+                                  LongIdent (SynLongIdent ([int], [], [None])),
+                                  false,
+                                  PreXmlDoc ((3,29), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,29--3,32),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((3,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,13--3,32),
+                            { BarRange =
+                               Some
+                                 /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,11--3,12) })],
+                        /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,11--3,32)),
+                     /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,11--3,32)),
+                  [],
+                  /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,5--3,32),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,9--3,10)
+                    WithKeyword = None })],
+              /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,0--3,32))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (1,0--3,32),
+          { LeadingKeyword =
+             Namespace
+               /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs
new file mode 100644
index 00000000000..cd26824b5d9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs
@@ -0,0 +1,2 @@
+match foo with
+| Bar bar -> ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs.bsl
new file mode 100644
index 00000000000..4fb1d3e2233
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs.bsl
@@ -0,0 +1,37 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfArrowInSynMatchClause.fs", false,
+      QualifiedNameOfFile RangeOfArrowInSynMatchClause, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfArrowInSynMatchClause], false, AnonModule,
+          [Expr
+             (Match
+                (Yes /root/RangeOfArrowInSynMatchClause.fs (1,0--1,14),
+                 Ident foo,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([Bar], [], [None]), None, None,
+                        Pats
+                          [Named
+                             (SynIdent (bar, None), false, None,
+                              /root/RangeOfArrowInSynMatchClause.fs (2,6--2,9))],
+                        None, /root/RangeOfArrowInSynMatchClause.fs (2,2--2,9)),
+                     None,
+                     Const
+                       (Unit, /root/RangeOfArrowInSynMatchClause.fs (2,13--2,15)),
+                     /root/RangeOfArrowInSynMatchClause.fs (2,2--2,15), Yes,
+                     { ArrowRange =
+                        Some /root/RangeOfArrowInSynMatchClause.fs (2,10--2,12)
+                       BarRange =
+                        Some /root/RangeOfArrowInSynMatchClause.fs (2,0--2,1) })],
+                 /root/RangeOfArrowInSynMatchClause.fs (1,0--2,15),
+                 { MatchKeyword =
+                    /root/RangeOfArrowInSynMatchClause.fs (1,0--1,5)
+                   WithKeyword =
+                    /root/RangeOfArrowInSynMatchClause.fs (1,10--1,14) }),
+              /root/RangeOfArrowInSynMatchClause.fs (1,0--2,15))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfArrowInSynMatchClause.fs (1,0--2,15),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs
new file mode 100644
index 00000000000..cf99189fafb
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs
@@ -0,0 +1,2 @@
+match foo with
+| Bar bar when (someCheck bar) -> ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
new file mode 100644
index 00000000000..89bcb7548d5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
@@ -0,0 +1,51 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfArrowInSynMatchClauseWithWhenClause.fs", false,
+      QualifiedNameOfFile RangeOfArrowInSynMatchClauseWithWhenClause, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfArrowInSynMatchClauseWithWhenClause], false, AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (1,0--1,14),
+                 Ident foo,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([Bar], [], [None]), None, None,
+                        Pats
+                          [Named
+                             (SynIdent (bar, None), false, None,
+                              /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,6--2,9))],
+                        None,
+                        /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,2--2,9)),
+                     Some
+                       (Paren
+                          (App
+                             (NonAtomic, false, Ident someCheck, Ident bar,
+                              /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,16--2,29)),
+                           /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,15--2,16),
+                           Some
+                             /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,29--2,30),
+                           /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,15--2,30))),
+                     Const
+                       (Unit,
+                        /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,34--2,36)),
+                     /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,2--2,36),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,31--2,33)
+                       BarRange =
+                        Some
+                          /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--2,1) })],
+                 /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (1,0--2,36),
+                 { MatchKeyword =
+                    /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (1,0--1,5)
+                   WithKeyword =
+                    /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (1,10--1,14) }),
+              /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (1,0--2,36))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (1,0--2,36),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttribute.fs b/tests/service/data/SyntaxTree/RangeOfAttribute.fs
new file mode 100644
index 00000000000..11b4435298e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttribute.fs
@@ -0,0 +1,2 @@
+[<MyAttribute(foo ="bar")>]
+do ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttribute.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttribute.fs.bsl
new file mode 100644
index 00000000000..8b360bbb0bb
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttribute.fs.bsl
@@ -0,0 +1,44 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttribute.fs", false, QualifiedNameOfFile RangeOfAttribute,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttribute], false, AnonModule,
+          [Attributes
+             ([{ Attributes =
+                  [{ TypeName = SynLongIdent ([MyAttribute], [], [None])
+                     ArgExpr =
+                      Paren
+                        (App
+                           (NonAtomic, false,
+                            App
+                              (NonAtomic, true,
+                               LongIdent
+                                 (false,
+                                  SynLongIdent
+                                    ([op_Equality], [],
+                                     [Some (OriginalNotation "=")]), None,
+                                  /root/RangeOfAttribute.fs (1,18--1,19)),
+                               Ident foo, /root/RangeOfAttribute.fs (1,14--1,19)),
+                            Const
+                              (String
+                                 ("bar", Regular,
+                                  /root/RangeOfAttribute.fs (1,19--1,24)),
+                               /root/RangeOfAttribute.fs (1,19--1,24)),
+                            /root/RangeOfAttribute.fs (1,14--1,24)),
+                         /root/RangeOfAttribute.fs (1,13--1,14),
+                         Some /root/RangeOfAttribute.fs (1,24--1,25),
+                         /root/RangeOfAttribute.fs (1,13--1,25))
+                     Target = None
+                     AppliesToGetterAndSetter = false
+                     Range = /root/RangeOfAttribute.fs (1,2--1,25) }]
+                 Range = /root/RangeOfAttribute.fs (1,0--1,27) }],
+              /root/RangeOfAttribute.fs (1,0--1,27));
+           Expr
+             (Do
+                (Const (Unit, /root/RangeOfAttribute.fs (2,3--2,5)),
+                 /root/RangeOfAttribute.fs (2,0--2,5)),
+              /root/RangeOfAttribute.fs (2,0--2,5))], PreXmlDocEmpty, [], None,
+          /root/RangeOfAttribute.fs (1,0--2,5), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs b/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs
new file mode 100644
index 00000000000..4ab8706c2ad
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs
@@ -0,0 +1 @@
+let [<Literal>] (A x) = 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
new file mode 100644
index 00000000000..89df33be436
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
@@ -0,0 +1,59 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet],
+          false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false,
+                  [{ Attributes =
+                      [{ TypeName = SynLongIdent ([Literal], [], [None])
+                         ArgExpr =
+                          Const
+                            (Unit,
+                             /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,6--1,13))
+                         Target = None
+                         AppliesToGetterAndSetter = false
+                         Range =
+                          /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,6--1,13) }]
+                     Range =
+                      /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,4--1,15) }],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Paren
+                    (LongIdent
+                       (SynLongIdent ([A], [], [None]), None, None,
+                        Pats
+                          [Named
+                             (SynIdent (x, None), false, None,
+                              /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,19--1,20))],
+                        None,
+                        /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,17--1,20)),
+                     /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,16--1,21)),
+                  None,
+                  Const
+                    (Int32 1,
+                     /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,24--1,25)),
+                  /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,4--1,21),
+                  Yes
+                    /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,0--1,25),
+                  { LeadingKeyword =
+                     Let
+                       /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,22--1,23) })],
+              /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,0--1,25))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,0--1,25),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs
new file mode 100644
index 00000000000..f6f73c86be0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs
@@ -0,0 +1,3 @@
+{ new System.Object() with
+    [<Foo>]
+    member x.ToString() = "F#" }
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
new file mode 100644
index 00000000000..008d9a4cf7c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
@@ -0,0 +1,88 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr], false,
+          AnonModule,
+          [Expr
+             (ObjExpr
+                (LongIdent
+                   (SynLongIdent
+                      ([System; Object],
+                       [/root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,12--1,13)],
+                       [None; None])),
+                 Some
+                   (Const
+                      (Unit,
+                       /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,19--1,21)),
+                    None),
+                 Some
+                   /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,22--1,26),
+                 [],
+                 [Member
+                    (SynBinding
+                       (None, Normal, false, false,
+                        [{ Attributes =
+                            [{ TypeName = SynLongIdent ([Foo], [], [None])
+                               ArgExpr =
+                                Const
+                                  (Unit,
+                                   /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,6--2,9))
+                               Target = None
+                               AppliesToGetterAndSetter = false
+                               Range =
+                                /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,6--2,9) }]
+                           Range =
+                            /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,4--2,11) }],
+                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (Some { IsInstance = true
+                                  IsDispatchSlot = false
+                                  IsOverrideOrExplicitImpl = true
+                                  IsFinal = false
+                                  GetterOrSetterIsCompilerGenerated = false
+                                  MemberKind = Member },
+                           SynValInfo
+                             ([[SynArgInfo ([], false, None)]; []],
+                              SynArgInfo ([], false, None)), None),
+                        LongIdent
+                          (SynLongIdent
+                             ([x; ToString],
+                              [/root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,12--3,13)],
+                              [None; None]), None, None,
+                           Pats
+                             [Paren
+                                (Const
+                                   (Unit,
+                                    /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,21--3,23)),
+                                 /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,21--3,23))],
+                           None,
+                           /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,11--3,23)),
+                        None,
+                        Const
+                          (String
+                             ("F#", Regular,
+                              /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,26--3,30)),
+                           /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,26--3,30)),
+                        /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,4--3,23),
+                        NoneAtInvisible,
+                        { LeadingKeyword =
+                           Member
+                             /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,4--3,10)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,24--3,25) }),
+                     /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,4--3,30))],
+                 [],
+                 /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,2--1,21),
+                 /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,0--3,32)),
+              /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,0--3,32))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,0--3,32),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs
new file mode 100644
index 00000000000..71d548b6759
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs
@@ -0,0 +1,3 @@
+type Tiger =
+    [<Foo>]
+    new () as tony = ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs.bsl
new file mode 100644
index 00000000000..b984723dd3f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs.bsl
@@ -0,0 +1,85 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec],
+          false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Tiger],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (1,5--1,10)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynBinding
+                           (None, Normal, false, false,
+                            [{ Attributes =
+                                [{ TypeName = SynLongIdent ([Foo], [], [None])
+                                   ArgExpr =
+                                    Const
+                                      (Unit,
+                                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,6--2,9))
+                                   Target = None
+                                   AppliesToGetterAndSetter = false
+                                   Range =
+                                    /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,6--2,9) }]
+                               Range =
+                                /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,4--2,11) }],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = false
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Constructor },
+                               SynValInfo ([[]], SynArgInfo ([], false, None)),
+                               Some tony),
+                            LongIdent
+                              (SynLongIdent ([new], [], [None]), None,
+                               Some (SynValTyparDecls (None, false)),
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,8--3,10)),
+                                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,8--3,10))],
+                               None,
+                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,4--3,7)),
+                            None,
+                            Const
+                              (Unit,
+                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,21--3,23)),
+                            /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,4--3,18),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               New
+                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,4--3,7)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,19--3,20) }),
+                         /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,4--3,23))],
+                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,4--3,23)),
+                  [], None,
+                  /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (1,5--3,23),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (1,11--1,12)
+                    WithKeyword = None })],
+              /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (1,0--3,23))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (1,0--3,23),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs
new file mode 100644
index 00000000000..e671c2e6802
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs
@@ -0,0 +1,3 @@
+type Tiger =
+    [<Foo>]
+    new () = ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
new file mode 100644
index 00000000000..c62548218f6
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
@@ -0,0 +1,84 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember],
+          false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Tiger],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (1,5--1,10)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynBinding
+                           (None, Normal, false, false,
+                            [{ Attributes =
+                                [{ TypeName = SynLongIdent ([Foo], [], [None])
+                                   ArgExpr =
+                                    Const
+                                      (Unit,
+                                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,6--2,9))
+                                   Target = None
+                                   AppliesToGetterAndSetter = false
+                                   Range =
+                                    /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,6--2,9) }]
+                               Range =
+                                /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,4--2,11) }],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = false
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Constructor },
+                               SynValInfo ([[]], SynArgInfo ([], false, None)),
+                               None),
+                            LongIdent
+                              (SynLongIdent ([new], [], [None]), None,
+                               Some (SynValTyparDecls (None, false)),
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,8--3,10)),
+                                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,8--3,10))],
+                               None,
+                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--3,7)),
+                            None,
+                            Const
+                              (Unit,
+                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,13--3,15)),
+                            /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,4--3,10),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               New
+                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--3,7)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,11--3,12) }),
+                         /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,4--3,15))],
+                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,4--3,15)),
+                  [], None,
+                  /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (1,5--3,15),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (1,11--1,12)
+                    WithKeyword = None })],
+              /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (1,0--3,15))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (1,0--3,15),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs
new file mode 100644
index 00000000000..b34c759c0e0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs
@@ -0,0 +1,5 @@
+type Bird =
+    [<Foo>]
+    member this.TheWord
+        with get () = myInternalValue
+        and set (value) = myInternalValue <- value
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
new file mode 100644
index 00000000000..c94a2eb6c39
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
@@ -0,0 +1,158 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty, [],
+      [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty],
+          false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Bird],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (1,5--1,9)),
+                  ObjectModel
+                    (Unspecified,
+                     [GetSetMember
+                        (Some
+                           (SynBinding
+                              (None, Normal, false, false,
+                               [{ Attributes =
+                                   [{ TypeName =
+                                       SynLongIdent ([Foo], [], [None])
+                                      ArgExpr =
+                                       Const
+                                         (Unit,
+                                          /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,6--2,9))
+                                      Target = None
+                                      AppliesToGetterAndSetter = false
+                                      Range =
+                                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,6--2,9) }]
+                                  Range =
+                                   /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,4--2,11) }],
+                               PreXmlMerge
+  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertyGet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)]; []],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([this; TheWord],
+                                     [/root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,15--3,16)],
+                                     [None; None]), Some get, None,
+                                  Pats
+                                    [Paren
+                                       (Const
+                                          (Unit,
+                                           /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,17--4,19)),
+                                        /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,17--4,19))],
+                                  None,
+                                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,13--4,19)),
+                               None, Ident myInternalValue,
+                               /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,4--4,19),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--3,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,20--4,21) })),
+                         Some
+                           (SynBinding
+                              (None, Normal, false, false,
+                               [{ Attributes =
+                                   [{ TypeName =
+                                       SynLongIdent ([Foo], [], [None])
+                                      ArgExpr =
+                                       Const
+                                         (Unit,
+                                          /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,6--2,9))
+                                      Target = None
+                                      AppliesToGetterAndSetter = false
+                                      Range =
+                                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,6--2,9) }]
+                                  Range =
+                                   /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,4--2,11) }],
+                               PreXmlMerge
+  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertySet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)];
+                                      [SynArgInfo ([], false, Some value)]],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([this; TheWord],
+                                     [/root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,15--3,16)],
+                                     [None; None]), Some set, None,
+                                  Pats
+                                    [Paren
+                                       (Named
+                                          (SynIdent (value, None), false, None,
+                                           /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,17--5,22)),
+                                        /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,16--5,23))],
+                                  None,
+                                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,12--5,23)),
+                               None,
+                               LongIdentSet
+                                 (SynLongIdent ([myInternalValue], [], [None]),
+                                  Ident value,
+                                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,26--5,50)),
+                               /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,4--5,23),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--3,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,24--5,25) })),
+                         /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,4--5,50),
+                         { InlineKeyword = None
+                           WithKeyword =
+                            /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,8--4,12)
+                           GetKeyword =
+                            Some
+                              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,13--4,16)
+                           AndKeyword =
+                            Some
+                              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,8--5,11)
+                           SetKeyword =
+                            Some
+                              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,12--5,15) })],
+                     /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,4--5,50)),
+                  [], None,
+                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (1,5--5,50),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (1,10--1,11)
+                    WithKeyword = None })],
+              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (1,0--5,50))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (1,0--5,50),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs
new file mode 100644
index 00000000000..46e0edfa75d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs
@@ -0,0 +1,10 @@
+type T() =
+    new () =
+        T ()
+
+    internal new () =
+        T ()
+
+    [<Foo>]
+    new () =
+        T ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
new file mode 100644
index 00000000000..29e5c3fb544
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
@@ -0,0 +1,189 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs", false,
+      QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSecondaryConstructor,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeShouldBeIncludedInSecondaryConstructor], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [T],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,6--1,8)),
+                         None,
+                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,5--1,6),
+                         { AsKeyword = None });
+                      Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = false
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Constructor },
+                               SynValInfo ([[]], SynArgInfo ([], false, None)),
+                               None),
+                            LongIdent
+                              (SynLongIdent ([new], [], [None]), None,
+                               Some (SynValTyparDecls (None, false)),
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,8--2,10)),
+                                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,8--2,10))],
+                               None,
+                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,4--2,7)),
+                            None,
+                            App
+                              (NonAtomic, false, Ident T,
+                               Const
+                                 (Unit,
+                                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,10--3,12)),
+                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,8--3,12)),
+                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,4--2,10),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               New
+                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,4--2,7)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,11--2,12) }),
+                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,4--3,12));
+                      Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = false
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Constructor },
+                               SynValInfo ([[]], SynArgInfo ([], false, None)),
+                               None),
+                            LongIdent
+                              (SynLongIdent ([new], [], [None]), None,
+                               Some (SynValTyparDecls (None, false)),
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,17--5,19)),
+                                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,17--5,19))],
+                               Some
+                                 (Internal
+                                    /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,4--5,12)),
+                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,13--5,16)),
+                            None,
+                            App
+                              (NonAtomic, false, Ident T,
+                               Const
+                                 (Unit,
+                                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,10--6,12)),
+                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,8--6,12)),
+                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,4--5,19),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               New
+                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,13--5,16)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,20--5,21) }),
+                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,4--6,12));
+                      Member
+                        (SynBinding
+                           (None, Normal, false, false,
+                            [{ Attributes =
+                                [{ TypeName = SynLongIdent ([Foo], [], [None])
+                                   ArgExpr =
+                                    Const
+                                      (Unit,
+                                       /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (8,6--8,9))
+                                   Target = None
+                                   AppliesToGetterAndSetter = false
+                                   Range =
+                                    /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (8,6--8,9) }]
+                               Range =
+                                /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (8,4--8,11) }],
+                            PreXmlDoc ((8,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = false
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Constructor },
+                               SynValInfo ([[]], SynArgInfo ([], false, None)),
+                               None),
+                            LongIdent
+                              (SynLongIdent ([new], [], [None]), None,
+                               Some (SynValTyparDecls (None, false)),
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,8--9,10)),
+                                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,8--9,10))],
+                               None,
+                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,4--9,7)),
+                            None,
+                            App
+                              (NonAtomic, false, Ident T,
+                               Const
+                                 (Unit,
+                                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,10--10,12)),
+                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,8--10,12)),
+                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (8,4--9,10),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               New
+                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,4--9,7)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,11--9,12) }),
+                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (8,4--10,12))],
+                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,4--10,12)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,6--1,8)),
+                        None,
+                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,5--1,6),
+                        { AsKeyword = None })),
+                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,5--10,12),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,0--10,12))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,0--10,12),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi
new file mode 100644
index 00000000000..bb1e058ae90
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi
@@ -0,0 +1,5 @@
+module internal FSharp.Compiler.ParseHelpers
+
+// The error raised by the parse_error_rich function, which is called by the parser engine
+[<NoEquality; NoComparison>]
+exception SyntaxError of obj * range: range
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
new file mode 100644
index 00000000000..6c06cd9e9ff
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
@@ -0,0 +1,68 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi",
+      QualifiedNameOfFile FSharp.Compiler.ParseHelpers, [], [],
+      [SynModuleOrNamespaceSig
+         ([FSharp; Compiler; ParseHelpers], false, NamedModule,
+          [Exception
+             (SynExceptionSig
+                (SynExceptionDefnRepr
+                   ([{ Attributes =
+                        [{ TypeName = SynLongIdent ([NoEquality], [], [None])
+                           ArgExpr =
+                            Const
+                              (Unit,
+                               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,2--4,12))
+                           Target = None
+                           AppliesToGetterAndSetter = false
+                           Range =
+                            /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,2--4,12) };
+                         { TypeName = SynLongIdent ([NoComparison], [], [None])
+                           ArgExpr =
+                            Const
+                              (Unit,
+                               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,14--4,26))
+                           Target = None
+                           AppliesToGetterAndSetter = false
+                           Range =
+                            /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,14--4,26) }]
+                       Range =
+                        /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,0--4,28) }],
+                    SynUnionCase
+                      ([], SynIdent (SyntaxError, None),
+                       Fields
+                         [SynField
+                            ([], false, None,
+                             LongIdent (SynLongIdent ([obj], [], [None])), false,
+                             PreXmlDoc ((5,25), FSharp.Compiler.Xml.XmlDocCollector),
+                             None,
+                             /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,25--5,28),
+                             { LeadingKeyword = None });
+                          SynField
+                            ([], false, Some range,
+                             LongIdent (SynLongIdent ([range], [], [None])),
+                             false,
+                             PreXmlDoc ((5,31), FSharp.Compiler.Xml.XmlDocCollector),
+                             None,
+                             /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,31--5,43),
+                             { LeadingKeyword = None })], PreXmlDocEmpty, None,
+                       /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,10--5,43),
+                       { BarRange = None }), None,
+                    PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                    /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,0--5,43)),
+                 None, [],
+                 /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,0--5,43)),
+              /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,0--5,43))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [],
+          Some
+            (Internal
+               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (1,7--1,15)),
+          /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (1,0--5,43),
+          { LeadingKeyword =
+             Module
+               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (1,0--1,6) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (3,0--3,90)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs
new file mode 100644
index 00000000000..b408af23d01
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs
@@ -0,0 +1,3 @@
+type Bar =
+    [<Foo>]
+    let x = 8
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
new file mode 100644
index 00000000000..c7d43fc5bf8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
@@ -0,0 +1,73 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Bar],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (1,5--1,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [LetBindings
+                        ([SynBinding
+                            (None, Normal, false, false,
+                             [{ Attributes =
+                                 [{ TypeName = SynLongIdent ([Foo], [], [None])
+                                    ArgExpr =
+                                     Const
+                                       (Unit,
+                                        /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,6--2,9))
+                                    Target = None
+                                    AppliesToGetterAndSetter = false
+                                    Range =
+                                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,6--2,9) }]
+                                Range =
+                                 /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,4--2,11) }],
+                             PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                             SynValData
+                               (None,
+                                SynValInfo ([], SynArgInfo ([], false, None)),
+                                None),
+                             Named
+                               (SynIdent (x, None), false, None,
+                                /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,8--3,9)),
+                             None,
+                             Const
+                               (Int32 8,
+                                /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,12--3,13)),
+                             /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,4--3,9),
+                             Yes
+                               /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,4--3,13),
+                             { LeadingKeyword =
+                                Let
+                                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--3,7)
+                               InlineKeyword = None
+                               EqualsRange =
+                                Some
+                                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,10--3,11) })],
+                         false, false,
+                         /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,4--3,13))],
+                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,4--3,13)),
+                  [], None,
+                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (1,5--3,13),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (1,0--3,13))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (1,0--3,13),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs
new file mode 100644
index 00000000000..53d833863b1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs
@@ -0,0 +1,3 @@
+type Bar =
+    [<Foo>]
+    member this.Something () = ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
new file mode 100644
index 00000000000..193fb4e0947
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
@@ -0,0 +1,86 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs", false,
+      QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynMemberDefnMember,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeShouldBeIncludedInSynMemberDefnMember], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Bar],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (1,5--1,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynBinding
+                           (None, Normal, false, false,
+                            [{ Attributes =
+                                [{ TypeName = SynLongIdent ([Foo], [], [None])
+                                   ArgExpr =
+                                    Const
+                                      (Unit,
+                                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,6--2,9))
+                                   Target = None
+                                   AppliesToGetterAndSetter = false
+                                   Range =
+                                    /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,6--2,9) }]
+                               Range =
+                                /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,4--2,11) }],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([this; Something],
+                                  [/root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,15--3,16)],
+                                  [None; None]), None, None,
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,26--3,28)),
+                                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,26--3,28))],
+                               None,
+                               /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,11--3,28)),
+                            None,
+                            Const
+                              (Unit,
+                               /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,31--3,33)),
+                            /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,4--3,28),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Member
+                                 /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--3,10)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,29--3,30) }),
+                         /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,4--3,33))],
+                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,4--3,33)),
+                  [], None,
+                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (1,5--3,33),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (1,0--3,33))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (1,0--3,33),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs
new file mode 100644
index 00000000000..fbbe968e935
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs
@@ -0,0 +1,2 @@
+[<Foo>]
+let a = 0
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
new file mode 100644
index 00000000000..1d67c442016
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
@@ -0,0 +1,50 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs", false,
+      QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynModuleDeclLet, [],
+      [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeShouldBeIncludedInSynModuleDeclLet], false,
+          AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false,
+                  [{ Attributes =
+                      [{ TypeName = SynLongIdent ([Foo], [], [None])
+                         ArgExpr =
+                          Const
+                            (Unit,
+                             /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,2--1,5))
+                         Target = None
+                         AppliesToGetterAndSetter = false
+                         Range =
+                          /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,2--1,5) }]
+                     Range =
+                      /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,0--1,7) }],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (a, None), false, None,
+                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,4--2,5)),
+                  None,
+                  Const
+                    (Int32 0,
+                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,8--2,9)),
+                  /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,0--2,5),
+                  Yes
+                    /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,0--2,9),
+                  { LeadingKeyword =
+                     Let
+                       /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,6--2,7) })],
+              /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,0--2,9))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,0--2,9),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs
new file mode 100644
index 00000000000..a354f809420
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs
@@ -0,0 +1,5 @@
+module TopLevel
+
+[<Foo>]
+module Nested =
+    ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
new file mode 100644
index 00000000000..a8e455424bd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
@@ -0,0 +1,45 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs",
+      false, QualifiedNameOfFile TopLevel, [], [],
+      [SynModuleOrNamespace
+         ([TopLevel], false, NamedModule,
+          [NestedModule
+             (SynComponentInfo
+                ([{ Attributes =
+                     [{ TypeName = SynLongIdent ([Foo], [], [None])
+                        ArgExpr =
+                         Const
+                           (Unit,
+                            /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (3,2--3,5))
+                        Target = None
+                        AppliesToGetterAndSetter = false
+                        Range =
+                         /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (3,2--3,5) }]
+                    Range =
+                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (3,0--3,7) }],
+                 None, [], [Nested],
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 None,
+                 /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,0--4,13)),
+              false,
+              [Expr
+                 (Const
+                    (Unit,
+                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (5,4--5,6)),
+                  /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (5,4--5,6))],
+              false,
+              /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (3,0--5,6),
+              { ModuleKeyword =
+                 Some
+                   /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,0--4,6)
+                EqualsRange =
+                 Some
+                   /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,14--4,15) })],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (1,0--5,6),
+          { LeadingKeyword =
+             Module
+               /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (1,0--1,6) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi
new file mode 100644
index 00000000000..57bcc6ad8ed
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi
@@ -0,0 +1,5 @@
+namespace SomeNamespace
+
+[<Foo>]
+module Nested =
+    val x : int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
new file mode 100644
index 00000000000..4f5fbc329b5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
@@ -0,0 +1,55 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi",
+      QualifiedNameOfFile
+        RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule, [], [],
+      [SynModuleOrNamespaceSig
+         ([SomeNamespace], false, DeclaredNamespace,
+          [NestedModule
+             (SynComponentInfo
+                ([{ Attributes =
+                     [{ TypeName = SynLongIdent ([Foo], [], [None])
+                        ArgExpr =
+                         Const
+                           (Unit,
+                            /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (3,2--3,5))
+                        Target = None
+                        AppliesToGetterAndSetter = false
+                        Range =
+                         /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (3,2--3,5) }]
+                    Range =
+                     /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (3,0--3,7) }],
+                 None, [], [Nested],
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 None,
+                 /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,0--4,13)),
+              false,
+              [Val
+                 (SynValSig
+                    ([], SynIdent (x, None), SynValTyparDecls (None, true),
+                     LongIdent (SynLongIdent ([int], [], [None])),
+                     SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                     PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                     None, None,
+                     /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,4--5,15),
+                     { LeadingKeyword =
+                        Val
+                          /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,4--5,7)
+                       InlineKeyword = None
+                       WithKeyword = None
+                       EqualsRange = None }),
+                  /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,4--5,15))],
+              /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (3,0--5,15),
+              { ModuleKeyword =
+                 Some
+                   /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,0--4,6)
+                EqualsRange =
+                 Some
+                   /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,14--4,15) })],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (1,0--5,15),
+          { LeadingKeyword =
+             Namespace
+               /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs
new file mode 100644
index 00000000000..853c817ceb5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs
@@ -0,0 +1,4 @@
+[<Foo>]
+type Bar =
+    class
+    end
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
new file mode 100644
index 00000000000..887e284f1a2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
@@ -0,0 +1,43 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs", false,
+      QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynTypeDefn, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeShouldBeIncludedInSynTypeDefn], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([{ Attributes =
+                         [{ TypeName = SynLongIdent ([Foo], [], [None])
+                            ArgExpr =
+                             Const
+                               (Unit,
+                                /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (1,2--1,5))
+                            Target = None
+                            AppliesToGetterAndSetter = false
+                            Range =
+                             /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (1,2--1,5) }]
+                        Range =
+                         /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (1,0--1,7) }],
+                     None, [], [Bar],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,5--2,8)),
+                  ObjectModel
+                    (Class, [],
+                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (3,4--4,7)),
+                  [], None,
+                  /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (1,0--4,7),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,9--2,10)
+                    WithKeyword = None })],
+              /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (1,0--4,7))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (1,0--4,7),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi
new file mode 100644
index 00000000000..adb81ff8191
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi
@@ -0,0 +1,6 @@
+namespace SomeNamespace
+
+[<Foo1>]
+type MyType =
+    class
+    end
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
new file mode 100644
index 00000000000..fc8456cb3d1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
@@ -0,0 +1,46 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi",
+      QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynTypeDefnSig, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([SomeNamespace], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([{ Attributes =
+                         [{ TypeName = SynLongIdent ([Foo1], [], [None])
+                            ArgExpr =
+                             Const
+                               (Unit,
+                                /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (3,2--3,6))
+                            Target = None
+                            AppliesToGetterAndSetter = false
+                            Range =
+                             /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (3,2--3,6) }]
+                        Range =
+                         /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (3,0--3,8) }],
+                     None, [], [MyType],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,5--4,11)),
+                  ObjectModel
+                    (Class, [],
+                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (5,4--6,7)),
+                  [],
+                  /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (3,0--6,7),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,0--4,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,12--4,13)
+                    WithKeyword = None })],
+              /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (3,0--6,7))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (1,0--6,7),
+          { LeadingKeyword =
+             Namespace
+               /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi
new file mode 100644
index 00000000000..3694c833447
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi
@@ -0,0 +1,5 @@
+namespace SomeNamespace
+
+type FooType =
+    [<Foo2>] // ValSpfn
+    abstract x : int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
new file mode 100644
index 00000000000..3a6f397bb09
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
@@ -0,0 +1,72 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi",
+      QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember,
+      [], [],
+      [SynModuleOrNamespaceSig
+         ([SomeNamespace], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [FooType],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (3,5--3,12)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynValSig
+                           ([{ Attributes =
+                                [{ TypeName = SynLongIdent ([Foo2], [], [None])
+                                   ArgExpr =
+                                    Const
+                                      (Unit,
+                                       /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,6--4,10))
+                                   Target = None
+                                   AppliesToGetterAndSetter = false
+                                   Range =
+                                    /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,6--4,10) }]
+                               Range =
+                                /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,4--4,12) }],
+                            SynIdent (x, None), SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,4--5,20),
+                            { LeadingKeyword =
+                               Abstract
+                                 /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--5,12)
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,4--5,20),
+                         { GetSetKeywords = None })],
+                     /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,4--5,20)),
+                  [],
+                  /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (3,5--5,20),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (3,13--3,14)
+                    WithKeyword = None })],
+              /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (3,0--5,20))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (1,0--5,20),
+          { LeadingKeyword =
+             Namespace
+               /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,13--4,23)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs
new file mode 100644
index 00000000000..ddcee340b70
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs
@@ -0,0 +1,3 @@
+type Crane =
+    [<Foo>]
+    member this.MyWriteOnlyProperty with set (value) = myInternalValue <- value
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
new file mode 100644
index 00000000000..a3fb9c3f834
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
@@ -0,0 +1,103 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty],
+          false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Crane],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (1,5--1,10)),
+                  ObjectModel
+                    (Unspecified,
+                     [GetSetMember
+                        (None,
+                         Some
+                           (SynBinding
+                              (None, Normal, false, false,
+                               [{ Attributes =
+                                   [{ TypeName =
+                                       SynLongIdent ([Foo], [], [None])
+                                      ArgExpr =
+                                       Const
+                                         (Unit,
+                                          /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,6--2,9))
+                                      Target = None
+                                      AppliesToGetterAndSetter = false
+                                      Range =
+                                       /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,6--2,9) }]
+                                  Range =
+                                   /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,4--2,11) }],
+                               PreXmlMerge
+  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertySet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)];
+                                      [SynArgInfo ([], false, Some value)]],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([this; MyWriteOnlyProperty],
+                                     [/root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,15--3,16)],
+                                     [None; None]), Some set, None,
+                                  Pats
+                                    [Paren
+                                       (Named
+                                          (SynIdent (value, None), false, None,
+                                           /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,46--3,51)),
+                                        /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,45--3,52))],
+                                  None,
+                                  /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,41--3,52)),
+                               None,
+                               LongIdentSet
+                                 (SynLongIdent ([myInternalValue], [], [None]),
+                                  Ident value,
+                                  /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,55--3,79)),
+                               /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,4--3,52),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--3,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,53--3,54) })),
+                         /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,4--3,79),
+                         { InlineKeyword = None
+                           WithKeyword =
+                            /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,36--3,40)
+                           GetKeyword = None
+                           AndKeyword = None
+                           SetKeyword =
+                            Some
+                              /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,41--3,44) })],
+                     /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,4--3,79)),
+                  [], None,
+                  /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (1,5--3,79),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (1,11--1,12)
+                    WithKeyword = None })],
+              /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (1,0--3,79))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (1,0--3,79),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs b/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs
new file mode 100644
index 00000000000..af2999f9930
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs
@@ -0,0 +1,2 @@
+[<Prefix.MyAttribute(foo ="bar")>]
+do ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs.bsl
new file mode 100644
index 00000000000..3ca5db58ed3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs.bsl
@@ -0,0 +1,50 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeWithPath.fs", false,
+      QualifiedNameOfFile RangeOfAttributeWithPath, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeWithPath], false, AnonModule,
+          [Attributes
+             ([{ Attributes =
+                  [{ TypeName =
+                      SynLongIdent
+                        ([Prefix; MyAttribute],
+                         [/root/RangeOfAttributeWithPath.fs (1,8--1,9)],
+                         [None; None])
+                     ArgExpr =
+                      Paren
+                        (App
+                           (NonAtomic, false,
+                            App
+                              (NonAtomic, true,
+                               LongIdent
+                                 (false,
+                                  SynLongIdent
+                                    ([op_Equality], [],
+                                     [Some (OriginalNotation "=")]), None,
+                                  /root/RangeOfAttributeWithPath.fs (1,25--1,26)),
+                               Ident foo,
+                               /root/RangeOfAttributeWithPath.fs (1,21--1,26)),
+                            Const
+                              (String
+                                 ("bar", Regular,
+                                  /root/RangeOfAttributeWithPath.fs (1,26--1,31)),
+                               /root/RangeOfAttributeWithPath.fs (1,26--1,31)),
+                            /root/RangeOfAttributeWithPath.fs (1,21--1,31)),
+                         /root/RangeOfAttributeWithPath.fs (1,20--1,21),
+                         Some /root/RangeOfAttributeWithPath.fs (1,31--1,32),
+                         /root/RangeOfAttributeWithPath.fs (1,20--1,32))
+                     Target = None
+                     AppliesToGetterAndSetter = false
+                     Range = /root/RangeOfAttributeWithPath.fs (1,2--1,32) }]
+                 Range = /root/RangeOfAttributeWithPath.fs (1,0--1,34) }],
+              /root/RangeOfAttributeWithPath.fs (1,0--1,34));
+           Expr
+             (Do
+                (Const (Unit, /root/RangeOfAttributeWithPath.fs (2,3--2,5)),
+                 /root/RangeOfAttributeWithPath.fs (2,0--2,5)),
+              /root/RangeOfAttributeWithPath.fs (2,0--2,5))], PreXmlDocEmpty, [],
+          None, /root/RangeOfAttributeWithPath.fs (1,0--2,5),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs b/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs
new file mode 100644
index 00000000000..ef664101455
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs
@@ -0,0 +1,2 @@
+[<assembly: MyAttribute(foo ="bar")>]
+do ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs.bsl
new file mode 100644
index 00000000000..69433673523
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs.bsl
@@ -0,0 +1,46 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributeWithTarget.fs", false,
+      QualifiedNameOfFile RangeOfAttributeWithTarget, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeWithTarget], false, AnonModule,
+          [Attributes
+             ([{ Attributes =
+                  [{ TypeName = SynLongIdent ([MyAttribute], [], [None])
+                     ArgExpr =
+                      Paren
+                        (App
+                           (NonAtomic, false,
+                            App
+                              (NonAtomic, true,
+                               LongIdent
+                                 (false,
+                                  SynLongIdent
+                                    ([op_Equality], [],
+                                     [Some (OriginalNotation "=")]), None,
+                                  /root/RangeOfAttributeWithTarget.fs (1,28--1,29)),
+                               Ident foo,
+                               /root/RangeOfAttributeWithTarget.fs (1,24--1,29)),
+                            Const
+                              (String
+                                 ("bar", Regular,
+                                  /root/RangeOfAttributeWithTarget.fs (1,29--1,34)),
+                               /root/RangeOfAttributeWithTarget.fs (1,29--1,34)),
+                            /root/RangeOfAttributeWithTarget.fs (1,24--1,34)),
+                         /root/RangeOfAttributeWithTarget.fs (1,23--1,24),
+                         Some /root/RangeOfAttributeWithTarget.fs (1,34--1,35),
+                         /root/RangeOfAttributeWithTarget.fs (1,23--1,35))
+                     Target = Some assembly
+                     AppliesToGetterAndSetter = false
+                     Range = /root/RangeOfAttributeWithTarget.fs (1,2--1,35) }]
+                 Range = /root/RangeOfAttributeWithTarget.fs (1,0--1,37) }],
+              /root/RangeOfAttributeWithTarget.fs (1,0--1,37));
+           Expr
+             (Do
+                (Const (Unit, /root/RangeOfAttributeWithTarget.fs (2,3--2,5)),
+                 /root/RangeOfAttributeWithTarget.fs (2,0--2,5)),
+              /root/RangeOfAttributeWithTarget.fs (2,0--2,5))], PreXmlDocEmpty,
+          [], None, /root/RangeOfAttributeWithTarget.fs (1,0--2,5),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs
new file mode 100644
index 00000000000..31251e9126c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs
@@ -0,0 +1,9 @@
+[<NoEquality ; NoComparison>]
+type Foo<'context, 'a> =
+    | Apply of ApplyCrate<'context, 'a>
+
+and [<CustomEquality ; NoComparison>] Bar<'context, 'a> =
+    internal {
+        Hash : int
+        Foo : Foo<'a, 'b>
+    }
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
new file mode 100644
index 00000000000..8f84f2cd436
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
@@ -0,0 +1,170 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs", false,
+      QualifiedNameOfFile RangeOfAttributesShouldBeIncludedInRecursiveTypes, [],
+      [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributesShouldBeIncludedInRecursiveTypes], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([{ Attributes =
+                         [{ TypeName = SynLongIdent ([NoEquality], [], [None])
+                            ArgExpr =
+                             Const
+                               (Unit,
+                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,2--1,12))
+                            Target = None
+                            AppliesToGetterAndSetter = false
+                            Range =
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,2--1,12) };
+                          { TypeName = SynLongIdent ([NoComparison], [], [None])
+                            ArgExpr =
+                             Const
+                               (Unit,
+                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,15--1,27))
+                            Target = None
+                            AppliesToGetterAndSetter = false
+                            Range =
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,15--1,27) }]
+                        Range =
+                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,0--1,29) }],
+                     Some
+                       (PostfixList
+                          ([SynTyparDecl ([], SynTypar (context, None, false));
+                            SynTyparDecl ([], SynTypar (a, None, false))], [],
+                           /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,8--2,22))),
+                     [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     true, None,
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,5--2,8)),
+                  Simple
+                    (Union
+                       (None,
+                        [SynUnionCase
+                           ([], SynIdent (Apply, None),
+                            Fields
+                              [SynField
+                                 ([], false, None,
+                                  App
+                                    (LongIdent
+                                       (SynLongIdent ([ApplyCrate], [], [None])),
+                                     Some
+                                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,25--3,26),
+                                     [Var
+                                        (SynTypar (context, None, false),
+                                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,26--3,34));
+                                      Var
+                                        (SynTypar (a, None, false),
+                                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,36--3,38))],
+                                     [/root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,34--3,35)],
+                                     Some
+                                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,38--3,39),
+                                     false,
+                                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,15--3,39)),
+                                  false,
+                                  PreXmlDoc ((3,15), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,15--3,39),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,6--3,39),
+                            { BarRange =
+                               Some
+                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,4--3,5) })],
+                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,4--3,39)),
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,4--3,39)),
+                  [], None,
+                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,0--3,39),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,23--2,24)
+                    WithKeyword = None });
+               SynTypeDefn
+                 (SynComponentInfo
+                    ([{ Attributes =
+                         [{ TypeName =
+                             SynLongIdent ([CustomEquality], [], [None])
+                            ArgExpr =
+                             Const
+                               (Unit,
+                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,6--5,20))
+                            Target = None
+                            AppliesToGetterAndSetter = false
+                            Range =
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,6--5,20) };
+                          { TypeName = SynLongIdent ([NoComparison], [], [None])
+                            ArgExpr =
+                             Const
+                               (Unit,
+                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,23--5,35))
+                            Target = None
+                            AppliesToGetterAndSetter = false
+                            Range =
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,23--5,35) }]
+                        Range =
+                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,4--5,37) }],
+                     Some
+                       (PostfixList
+                          ([SynTyparDecl ([], SynTypar (context, None, false));
+                            SynTyparDecl ([], SynTypar (a, None, false))], [],
+                           /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,41--5,55))),
+                     [], [Bar],
+                     PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                     true, None,
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,38--5,41)),
+                  Simple
+                    (Record
+                       (Some
+                          (Internal
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,4--6,12)),
+                        [SynField
+                           ([], false, Some Hash,
+                            LongIdent (SynLongIdent ([int], [], [None])), false,
+                            PreXmlDoc ((7,8), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (7,8--7,18),
+                            { LeadingKeyword = None });
+                         SynField
+                           ([], false, Some Foo,
+                            App
+                              (LongIdent (SynLongIdent ([Foo], [], [None])),
+                               Some
+                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,17--8,18),
+                               [Var
+                                  (SynTypar (a, None, false),
+                                   /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,18--8,20));
+                                Var
+                                  (SynTypar (b, None, false),
+                                   /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,22--8,24))],
+                               [/root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,20--8,21)],
+                               Some
+                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,24--8,25),
+                               false,
+                               /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,14--8,25)),
+                            false,
+                            PreXmlDoc ((8,8), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,8--8,25),
+                            { LeadingKeyword = None })],
+                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,4--9,5)),
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,4--9,5)),
+                  [], None,
+                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,4--9,5),
+                  { LeadingKeyword =
+                     And
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,0--5,3)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,56--5,57)
+                    WithKeyword = None })],
+              /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,0--9,5))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,0--9,5),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi
new file mode 100644
index 00000000000..c53b09a6726
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi
@@ -0,0 +1,11 @@
+namespace SomeNamespace
+
+type Foo =
+    | Bar
+
+and [<CustomEquality>] Bang =
+    internal
+        {
+            LongNameBarBarBarBarBarBarBar: int
+        }
+        override GetHashCode : unit -> int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
new file mode 100644
index 00000000000..ba55ad5882a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
@@ -0,0 +1,115 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi",
+      QualifiedNameOfFile RangeOfAttributesShouldBeIncludedInRecursiveTypes, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([SomeNamespace], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (3,5--3,8)),
+                  Simple
+                    (Union
+                       (None,
+                        [SynUnionCase
+                           ([], SynIdent (Bar, None), Fields [],
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,6--4,9),
+                            { BarRange =
+                               Some
+                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,4--4,5) })],
+                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,4--4,9)),
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,4--4,9)),
+                  [],
+                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (3,5--4,9),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (3,9--3,10)
+                    WithKeyword = None });
+               SynTypeDefnSig
+                 (SynComponentInfo
+                    ([{ Attributes =
+                         [{ TypeName =
+                             SynLongIdent ([CustomEquality], [], [None])
+                            ArgExpr =
+                             Const
+                               (Unit,
+                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,6--6,20))
+                            Target = None
+                            AppliesToGetterAndSetter = false
+                            Range =
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,6--6,20) }]
+                        Range =
+                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,4--6,22) }],
+                     None, [], [Bang],
+                     PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,23--6,27)),
+                  Simple
+                    (Record
+                       (Some
+                          (Internal
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,4--7,12)),
+                        [SynField
+                           ([], false, Some LongNameBarBarBarBarBarBarBar,
+                            LongIdent (SynLongIdent ([int], [], [None])), false,
+                            PreXmlDoc ((9,12), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (9,12--9,46),
+                            { LeadingKeyword = None })],
+                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,4--10,9)),
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,4--10,9)),
+                  [Member
+                     (SynValSig
+                        ([], SynIdent (GetHashCode, None),
+                         SynValTyparDecls (None, true),
+                         Fun
+                           (LongIdent (SynLongIdent ([unit], [], [None])),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (11,31--11,42),
+                            { ArrowRange =
+                               /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (11,36--11,38) }),
+                         SynValInfo
+                           ([[SynArgInfo ([], false, None)]],
+                            SynArgInfo ([], false, None)), false, false,
+                         PreXmlDoc ((11,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         None, None,
+                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (11,8--11,42),
+                         { LeadingKeyword =
+                            Override
+                              /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (11,8--11,16)
+                           InlineKeyword = None
+                           WithKeyword = None
+                           EqualsRange = None }),
+                      { IsInstance = true
+                        IsDispatchSlot = false
+                        IsOverrideOrExplicitImpl = true
+                        IsFinal = false
+                        GetterOrSetterIsCompilerGenerated = false
+                        MemberKind = Member },
+                      /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (11,8--11,42),
+                      { GetSetKeywords = None })],
+                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,4--11,42),
+                  { LeadingKeyword =
+                     And
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,0--6,3)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,28--6,29)
+                    WithKeyword = None })],
+              /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (3,0--11,42))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (1,0--11,42),
+          { LeadingKeyword =
+             Namespace
+               /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs b/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs
new file mode 100644
index 00000000000..34b2a1e3112
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs
@@ -0,0 +1,7 @@
+try
+    foo ()
+with
+| IOException as ioex ->
+    // some comment
+    ()
+| ex -> ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
new file mode 100644
index 00000000000..471c28975b9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
@@ -0,0 +1,76 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs", false,
+      QualifiedNameOfFile RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith], false,
+          AnonModule,
+          [Expr
+             (TryWith
+                (App
+                   (NonAtomic, false, Ident foo,
+                    Const
+                      (Unit,
+                       /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,8--2,10)),
+                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,4--2,10)),
+                 [SynMatchClause
+                    (As
+                       (LongIdent
+                          (SynLongIdent ([IOException], [], [None]), None, None,
+                           Pats [], None,
+                           /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,2--4,13)),
+                        Named
+                          (SynIdent (ioex, None), false, None,
+                           /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,17--4,21)),
+                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,2--4,21)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (6,4--6,6)),
+                     /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,2--6,6),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,22--4,24)
+                       BarRange =
+                        Some
+                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,0--4,1) });
+                  SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (7,2--7,4)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (7,8--7,10)),
+                     /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (7,2--7,10),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (7,5--7,7)
+                       BarRange =
+                        Some
+                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (7,0--7,1) })],
+                 /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (1,0--7,10),
+                 Yes
+                   /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (1,0--1,3),
+                 Yes
+                   /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (3,0--3,4),
+                 { TryKeyword =
+                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (1,0--1,3)
+                   TryToWithRange =
+                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (1,0--3,4)
+                   WithKeyword =
+                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (3,0--3,4)
+                   WithToEndRange =
+                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (3,0--7,10) }),
+              /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (1,0--7,10))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (1,0--7,10),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,4--5,19)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs
new file mode 100644
index 00000000000..cf99189fafb
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs
@@ -0,0 +1,2 @@
+match foo with
+| Bar bar when (someCheck bar) -> ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
new file mode 100644
index 00000000000..7ccbae4ed8a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
@@ -0,0 +1,52 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs", false,
+      QualifiedNameOfFile RangeOfBarInASingleSynMatchClauseInSynExprMatch, [],
+      [],
+      [SynModuleOrNamespace
+         ([RangeOfBarInASingleSynMatchClauseInSynExprMatch], false, AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (1,0--1,14),
+                 Ident foo,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([Bar], [], [None]), None, None,
+                        Pats
+                          [Named
+                             (SynIdent (bar, None), false, None,
+                              /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,6--2,9))],
+                        None,
+                        /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,2--2,9)),
+                     Some
+                       (Paren
+                          (App
+                             (NonAtomic, false, Ident someCheck, Ident bar,
+                              /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,16--2,29)),
+                           /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,15--2,16),
+                           Some
+                             /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,29--2,30),
+                           /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,15--2,30))),
+                     Const
+                       (Unit,
+                        /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,34--2,36)),
+                     /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,2--2,36),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,31--2,33)
+                       BarRange =
+                        Some
+                          /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--2,1) })],
+                 /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (1,0--2,36),
+                 { MatchKeyword =
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (1,0--1,5)
+                   WithKeyword =
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (1,10--1,14) }),
+              /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (1,0--2,36))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (1,0--2,36),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
new file mode 100644
index 00000000000..8fe9ac27d43
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
@@ -0,0 +1,4 @@
+try
+    foo ()
+with
+| exn -> ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
new file mode 100644
index 00000000000..2f1c247f6dd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
@@ -0,0 +1,50 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs", false,
+      QualifiedNameOfFile RangeOfBarInASingleSynMatchClauseInSynExprTryWith, [],
+      [],
+      [SynModuleOrNamespace
+         ([RangeOfBarInASingleSynMatchClauseInSynExprTryWith], false, AnonModule,
+          [Expr
+             (TryWith
+                (App
+                   (NonAtomic, false, Ident foo,
+                    Const
+                      (Unit,
+                       /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,8--2,10)),
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,4--2,10)),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (exn, None), false, None,
+                        /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,2--4,5)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,9--4,11)),
+                     /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,2--4,11),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,6--4,8)
+                       BarRange =
+                        Some
+                          /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,1) })],
+                 /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--4,11),
+                 Yes
+                   /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--1,3),
+                 Yes
+                   /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,0--3,4),
+                 { TryKeyword =
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--1,3)
+                   TryToWithRange =
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--3,4)
+                   WithKeyword =
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,0--3,4)
+                   WithToEndRange =
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,0--4,11) }),
+              /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--4,11))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--4,11),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs b/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs
new file mode 100644
index 00000000000..66757d1e40d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs
@@ -0,0 +1,3 @@
+match foo with
+| Bar bar when (someCheck bar) -> ()
+| Far too -> near ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
new file mode 100644
index 00000000000..1478043fec1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
@@ -0,0 +1,76 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs", false,
+      QualifiedNameOfFile RangeOfBarInMultipleSynMatchClausesInSynExprMatch, [],
+      [],
+      [SynModuleOrNamespace
+         ([RangeOfBarInMultipleSynMatchClausesInSynExprMatch], false, AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (1,0--1,14),
+                 Ident foo,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([Bar], [], [None]), None, None,
+                        Pats
+                          [Named
+                             (SynIdent (bar, None), false, None,
+                              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,6--2,9))],
+                        None,
+                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,2--2,9)),
+                     Some
+                       (Paren
+                          (App
+                             (NonAtomic, false, Ident someCheck, Ident bar,
+                              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,16--2,29)),
+                           /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,15--2,16),
+                           Some
+                             /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,29--2,30),
+                           /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,15--2,30))),
+                     Const
+                       (Unit,
+                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,34--2,36)),
+                     /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,2--2,36),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,31--2,33)
+                       BarRange =
+                        Some
+                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--2,1) });
+                  SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([Far], [], [None]), None, None,
+                        Pats
+                          [Named
+                             (SynIdent (too, None), false, None,
+                              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,6--3,9))],
+                        None,
+                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,2--3,9)),
+                     None,
+                     App
+                       (NonAtomic, false, Ident near,
+                        Const
+                          (Unit,
+                           /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,18--3,20)),
+                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,13--3,20)),
+                     /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,2--3,20),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,10--3,12)
+                       BarRange =
+                        Some
+                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,0--3,1) })],
+                 /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (1,0--3,20),
+                 { MatchKeyword =
+                    /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (1,0--1,5)
+                   WithKeyword =
+                    /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (1,10--1,14) }),
+              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (1,0--3,20))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (1,0--3,20),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi
new file mode 100644
index 00000000000..6df4f86fa6a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi
@@ -0,0 +1,4 @@
+namespace Foo
+
+module X =
+val bar : int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi.bsl
new file mode 100644
index 00000000000..20700156fce
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi.bsl
@@ -0,0 +1,42 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi",
+      QualifiedNameOfFile RangeOfEqualSignShouldBePresent,SignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Foo], false, DeclaredNamespace,
+          [NestedModule
+             (SynComponentInfo
+                ([], None, [], [X],
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 None,
+                 /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (3,0--3,8)),
+              false,
+              [Val
+                 (SynValSig
+                    ([], SynIdent (bar, None), SynValTyparDecls (None, true),
+                     LongIdent (SynLongIdent ([int], [], [None])),
+                     SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     None, None,
+                     /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,0--4,13),
+                     { LeadingKeyword =
+                        Val
+                          /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,0--4,3)
+                       InlineKeyword = None
+                       WithKeyword = None
+                       EqualsRange = None }),
+                  /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,0--4,13))],
+              /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (3,0--4,13),
+              { ModuleKeyword =
+                 Some
+                   /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (3,0--3,6)
+                EqualsRange =
+                 Some
+                   /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (3,9--3,10) })],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (1,0--4,13),
+          { LeadingKeyword =
+             Namespace
+               /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs
new file mode 100644
index 00000000000..aff77d7dc43
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs
@@ -0,0 +1,2 @@
+module X =
+()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs.bsl
new file mode 100644
index 00000000000..d8d364f1492
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs.bsl
@@ -0,0 +1,26 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfEqualSignShouldBePresent.fs", false,
+      QualifiedNameOfFile RangeOfEqualSignShouldBePresent, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfEqualSignShouldBePresent], false, AnonModule,
+          [NestedModule
+             (SynComponentInfo
+                ([], None, [], [X],
+                 PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 None, /root/RangeOfEqualSignShouldBePresent.fs (1,0--1,8)),
+              false,
+              [Expr
+                 (Const
+                    (Unit, /root/RangeOfEqualSignShouldBePresent.fs (2,0--2,2)),
+                  /root/RangeOfEqualSignShouldBePresent.fs (2,0--2,2))], false,
+              /root/RangeOfEqualSignShouldBePresent.fs (1,0--2,2),
+              { ModuleKeyword =
+                 Some /root/RangeOfEqualSignShouldBePresent.fs (1,0--1,6)
+                EqualsRange =
+                 Some /root/RangeOfEqualSignShouldBePresent.fs (1,9--1,10) })],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfEqualSignShouldBePresent.fs (1,0--2,2),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs
new file mode 100644
index 00000000000..d9203654144
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs
@@ -0,0 +1,3 @@
+do
+    let z: int = 2
+    ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs.bsl
new file mode 100644
index 00000000000..4f3c53fec8f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs.bsl
@@ -0,0 +1,57 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs", false,
+      QualifiedNameOfFile RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed], false,
+          AnonModule,
+          [Expr
+             (Do
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (z, None), false, None,
+                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,8--2,9)),
+                        Some
+                          (SynBindingReturnInfo
+                             (LongIdent (SynLongIdent ([int], [], [None])),
+                              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,11--2,14),
+                              [],
+                              { ColonRange =
+                                 Some
+                                   /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,9--2,10) })),
+                        Typed
+                          (Const
+                             (Int32 2,
+                              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,17--2,18)),
+                           LongIdent (SynLongIdent ([int], [], [None])),
+                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,17--2,18)),
+                        /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,8--2,9),
+                        Yes
+                          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,4--2,18),
+                        { LeadingKeyword =
+                           Let
+                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,4--2,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,15--2,16) })],
+                    Const
+                      (Unit,
+                       /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,4--3,6)),
+                    /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,4--3,6),
+                    { InKeyword = None }),
+                 /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (1,0--3,6)),
+              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (1,0--3,6))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (1,0--3,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs
new file mode 100644
index 00000000000..32bda4dd3e5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs
@@ -0,0 +1,3 @@
+do
+    let z = 2
+    ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
new file mode 100644
index 00000000000..68fc962d362
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
@@ -0,0 +1,46 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs", false,
+      QualifiedNameOfFile RangeOfEqualSignShouldBePresentInLocalLetBinding, [],
+      [],
+      [SynModuleOrNamespace
+         ([RangeOfEqualSignShouldBePresentInLocalLetBinding], false, AnonModule,
+          [Expr
+             (Do
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (z, None), false, None,
+                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,8--2,9)),
+                        None,
+                        Const
+                          (Int32 2,
+                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,12--2,13)),
+                        /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,8--2,9),
+                        Yes
+                          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,4--2,13),
+                        { LeadingKeyword =
+                           Let
+                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,4--2,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,10--2,11) })],
+                    Const
+                      (Unit,
+                       /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,4--3,6)),
+                    /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,4--3,6),
+                    { InKeyword = None }),
+                 /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (1,0--3,6)),
+              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (1,0--3,6))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (1,0--3,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs
new file mode 100644
index 00000000000..3242dd958ae
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs
@@ -0,0 +1,2 @@
+type X() =
+    member this.Y () = z
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs.bsl
new file mode 100644
index 00000000000..ef2baea4bc4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs.bsl
@@ -0,0 +1,91 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,6--1,8)),
+                         None,
+                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,5--1,6),
+                         { AsKeyword = None });
+                      Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([this; Y],
+                                  [/root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,15--2,16)],
+                                  [None; None]), None, None,
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,18--2,20)),
+                                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,18--2,20))],
+                               None,
+                               /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,11--2,20)),
+                            None, Ident z,
+                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,11--2,20),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Member
+                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,4--2,10)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,21--2,22) }),
+                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,4--2,24))],
+                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,4--2,24)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,6--1,8)),
+                        None,
+                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,5--1,6),
+                        { AsKeyword = None })),
+                  /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,5--2,24),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,0--2,24))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,0--2,24),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs
new file mode 100644
index 00000000000..83afc7e1c5f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs
@@ -0,0 +1,2 @@
+type X() =
+    member this.Y () : string = z
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs.bsl
new file mode 100644
index 00000000000..f586e0ea84a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs.bsl
@@ -0,0 +1,103 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,6--1,8)),
+                         None,
+                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,5--1,6),
+                         { AsKeyword = None });
+                      Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([this; Y],
+                                  [/root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,15--2,16)],
+                                  [None; None]), None, None,
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,18--2,20)),
+                                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,18--2,20))],
+                               None,
+                               /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,11--2,20)),
+                            Some
+                              (SynBindingReturnInfo
+                                 (LongIdent
+                                    (SynLongIdent ([string], [], [None])),
+                                  /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,23--2,29),
+                                  [],
+                                  { ColonRange =
+                                     Some
+                                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,21--2,22) })),
+                            Typed
+                              (Ident z,
+                               LongIdent (SynLongIdent ([string], [], [None])),
+                               /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,32--2,33)),
+                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,11--2,20),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Member
+                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,4--2,10)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,30--2,31) }),
+                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,4--2,33))],
+                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,4--2,33)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,6--1,8)),
+                        None,
+                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,5--1,6),
+                        { AsKeyword = None })),
+                  /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,5--2,33),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,0--2,33))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,0--2,33),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs
new file mode 100644
index 00000000000..979c0591f61
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs
@@ -0,0 +1,2 @@
+type X() =
+    member this.Y = z
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
new file mode 100644
index 00000000000..6a0554e6fb5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
@@ -0,0 +1,81 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfEqualSignShouldBePresentInMemberBinding.fs", false,
+      QualifiedNameOfFile RangeOfEqualSignShouldBePresentInMemberBinding, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfEqualSignShouldBePresentInMemberBinding], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,6--1,8)),
+                         None,
+                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,5--1,6),
+                         { AsKeyword = None });
+                      Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([this; Y],
+                                  [/root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,15--2,16)],
+                                  [None; None]), None, None, Pats [], None,
+                               /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,11--2,17)),
+                            None, Ident z,
+                            /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,11--2,17),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Member
+                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,4--2,10)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,18--2,19) }),
+                         /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,4--2,21))],
+                     /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,4--2,21)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,6--1,8)),
+                        None,
+                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,5--1,6),
+                        { AsKeyword = None })),
+                  /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,5--2,21),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,0--2,21))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,0--2,21),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs
new file mode 100644
index 00000000000..cb2f1df6c7d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs
@@ -0,0 +1,4 @@
+type Y() =
+    member this.MyReadWriteProperty
+        with get () = myInternalValue
+        and set (value) = myInternalValue <- value
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
new file mode 100644
index 00000000000..86ef322b252
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
@@ -0,0 +1,147 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfEqualSignShouldBePresentInProperty.fs", false,
+      QualifiedNameOfFile RangeOfEqualSignShouldBePresentInProperty, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfEqualSignShouldBePresentInProperty], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Y],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,6--1,8)),
+                         None,
+                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,5--1,6),
+                         { AsKeyword = None });
+                      GetSetMember
+                        (Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertyGet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)]; []],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([this; MyReadWriteProperty],
+                                     [/root/RangeOfEqualSignShouldBePresentInProperty.fs (2,15--2,16)],
+                                     [None; None]), Some get, None,
+                                  Pats
+                                    [Paren
+                                       (Const
+                                          (Unit,
+                                           /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,17--3,19)),
+                                        /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,17--3,19))],
+                                  None,
+                                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,13--3,19)),
+                               None, Ident myInternalValue,
+                               /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,13--3,19),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,4--2,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,20--3,21) })),
+                         Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertySet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)];
+                                      [SynArgInfo ([], false, Some value)]],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([this; MyReadWriteProperty],
+                                     [/root/RangeOfEqualSignShouldBePresentInProperty.fs (2,15--2,16)],
+                                     [None; None]), Some set, None,
+                                  Pats
+                                    [Paren
+                                       (Named
+                                          (SynIdent (value, None), false, None,
+                                           /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,17--4,22)),
+                                        /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,16--4,23))],
+                                  None,
+                                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,12--4,23)),
+                               None,
+                               LongIdentSet
+                                 (SynLongIdent ([myInternalValue], [], [None]),
+                                  Ident value,
+                                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,26--4,50)),
+                               /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,12--4,23),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,4--2,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,24--4,25) })),
+                         /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,4--4,50),
+                         { InlineKeyword = None
+                           WithKeyword =
+                            /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,8--3,12)
+                           GetKeyword =
+                            Some
+                              /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,13--3,16)
+                           AndKeyword =
+                            Some
+                              /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,8--4,11)
+                           SetKeyword =
+                            Some
+                              /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,12--4,15) })],
+                     /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,4--4,50)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,6--1,8)),
+                        None,
+                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,5--1,6),
+                        { AsKeyword = None })),
+                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,5--4,50),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,0--4,50))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,0--4,50),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs
new file mode 100644
index 00000000000..395f9bfe3d8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs
@@ -0,0 +1 @@
+let v : int = 12
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs.bsl
new file mode 100644
index 00000000000..9d88e58ef25
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs.bsl
@@ -0,0 +1,49 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed],
+          false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,4--1,5)),
+                  Some
+                    (SynBindingReturnInfo
+                       (LongIdent (SynLongIdent ([int], [], [None])),
+                        /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,8--1,11),
+                        [],
+                        { ColonRange =
+                           Some
+                             /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,6--1,7) })),
+                  Typed
+                    (Const
+                       (Int32 12,
+                        /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,14--1,16)),
+                     LongIdent (SynLongIdent ([int], [], [None])),
+                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,14--1,16)),
+                  /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,4--1,5),
+                  Yes
+                    /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,0--1,16),
+                  { LeadingKeyword =
+                     Let
+                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,12--1,13) })],
+              /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,0--1,16))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,0--1,16),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs
new file mode 100644
index 00000000000..ddcb0df4840
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs
@@ -0,0 +1 @@
+let v = 12
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
new file mode 100644
index 00000000000..8b89774e90a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
@@ -0,0 +1,38 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs", false,
+      QualifiedNameOfFile
+        RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding], false,
+          AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,4--1,5)),
+                  None,
+                  Const
+                    (Int32 12,
+                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,8--1,10)),
+                  /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,4--1,5),
+                  Yes
+                    /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,10),
+                  { LeadingKeyword =
+                     Let
+                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,6--1,7) })],
+              /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,10))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,10),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs
new file mode 100644
index 00000000000..3b53cd640c1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs
@@ -0,0 +1,3 @@
+let a =
+    let b c = d
+    ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
new file mode 100644
index 00000000000..e0d8a512214
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
@@ -0,0 +1,67 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs", false,
+      QualifiedNameOfFile
+        RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding], false,
+          AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (a, None), false, None,
+                     /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (1,4--1,5)),
+                  None,
+                  LetOrUse
+                    (false, false,
+                     [SynBinding
+                        (None, Normal, false, false, [],
+                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         SynValData
+                           (None,
+                            SynValInfo
+                              ([[SynArgInfo ([], false, Some c)]],
+                               SynArgInfo ([], false, None)), None),
+                         LongIdent
+                           (SynLongIdent ([b], [], [None]), None, None,
+                            Pats
+                              [Named
+                                 (SynIdent (c, None), false, None,
+                                  /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,10--2,11))],
+                            None,
+                            /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,8--2,11)),
+                         None, Ident d,
+                         /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,8--2,11),
+                         NoneAtLet,
+                         { LeadingKeyword =
+                            Let
+                              /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,4--2,7)
+                           InlineKeyword = None
+                           EqualsRange =
+                            Some
+                              /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,12--2,13) })],
+                     Const
+                       (Unit,
+                        /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,4--3,6)),
+                     /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,4--3,6),
+                     { InKeyword = None }),
+                  /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (1,4--1,5),
+                  NoneAtLet,
+                  { LeadingKeyword =
+                     Let
+                       /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (1,6--1,7) })],
+              /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (1,0--3,6))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (1,0--3,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs
new file mode 100644
index 00000000000..ddcb0df4840
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs
@@ -0,0 +1 @@
+let v = 12
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
new file mode 100644
index 00000000000..5c485af2ea3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
@@ -0,0 +1,39 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding], false,
+          AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,4--1,5)),
+                  None,
+                  Const
+                    (Int32 12,
+                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,8--1,10)),
+                  /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,4--1,5),
+                  Yes
+                    /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,10),
+                  { LeadingKeyword =
+                     Let
+                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,6--1,7) })],
+              /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,10))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,10),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs
new file mode 100644
index 00000000000..fa422a5ee06
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs
@@ -0,0 +1,4 @@
+/// XmlDoc
+[<SomeAttribute>]
+// some comment
+let v = 12
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
new file mode 100644
index 00000000000..a8abd6f450e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
@@ -0,0 +1,55 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes],
+          false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false,
+                  [{ Attributes =
+                      [{ TypeName = SynLongIdent ([SomeAttribute], [], [None])
+                         ArgExpr =
+                          Const
+                            (Unit,
+                             /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,2--2,15))
+                         Target = None
+                         AppliesToGetterAndSetter = false
+                         Range =
+                          /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,2--2,15) }]
+                     Range =
+                      /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,0--2,17) }],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (4,4--4,5)),
+                  None,
+                  Const
+                    (Int32 12,
+                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (4,8--4,10)),
+                  /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (1,0--4,5),
+                  Yes
+                    /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,0--4,10),
+                  { LeadingKeyword =
+                     Let
+                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (4,0--4,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (4,6--4,7) })],
+              /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (1,0--4,10))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,0--4,10),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,0--3,15)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi b/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi
new file mode 100644
index 00000000000..b3cab2b90b4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi
@@ -0,0 +1,6 @@
+module internal FSharp.Compiler.ParseHelpers
+
+exception SyntaxError of obj * range: range with
+    member Meh : string -> int
+
+open Foo
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
new file mode 100644
index 00000000000..7c6aca28d03
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
@@ -0,0 +1,80 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi",
+      QualifiedNameOfFile FSharp.Compiler.ParseHelpers, [], [],
+      [SynModuleOrNamespaceSig
+         ([FSharp; Compiler; ParseHelpers], false, NamedModule,
+          [Exception
+             (SynExceptionSig
+                (SynExceptionDefnRepr
+                   ([],
+                    SynUnionCase
+                      ([], SynIdent (SyntaxError, None),
+                       Fields
+                         [SynField
+                            ([], false, None,
+                             LongIdent (SynLongIdent ([obj], [], [None])), false,
+                             PreXmlDoc ((3,25), FSharp.Compiler.Xml.XmlDocCollector),
+                             None,
+                             /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,25--3,28),
+                             { LeadingKeyword = None });
+                          SynField
+                            ([], false, Some range,
+                             LongIdent (SynLongIdent ([range], [], [None])),
+                             false,
+                             PreXmlDoc ((3,31), FSharp.Compiler.Xml.XmlDocCollector),
+                             None,
+                             /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,31--3,43),
+                             { LeadingKeyword = None })], PreXmlDocEmpty, None,
+                       /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,10--3,43),
+                       { BarRange = None }), None,
+                    PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                    /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,0--3,43)),
+                 Some
+                   /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,44--3,48),
+                 [Member
+                    (SynValSig
+                       ([], SynIdent (Meh, None), SynValTyparDecls (None, true),
+                        Fun
+                          (LongIdent (SynLongIdent ([string], [], [None])),
+                           LongIdent (SynLongIdent ([int], [], [None])),
+                           /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,17--4,30),
+                           { ArrowRange =
+                              /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,24--4,26) }),
+                        SynValInfo
+                          ([[SynArgInfo ([], false, None)]],
+                           SynArgInfo ([], false, None)), false, false,
+                        PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        None, None,
+                        /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,4--4,30),
+                        { LeadingKeyword =
+                           Member
+                             /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,4--4,10)
+                          InlineKeyword = None
+                          WithKeyword = None
+                          EqualsRange = None }),
+                     { IsInstance = true
+                       IsDispatchSlot = false
+                       IsOverrideOrExplicitImpl = false
+                       IsFinal = false
+                       GetterOrSetterIsCompilerGenerated = false
+                       MemberKind = Member },
+                     /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,4--4,30),
+                     { GetSetKeywords = None })],
+                 /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,0--4,30)),
+              /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,0--4,30));
+           Open
+             (ModuleOrNamespace
+                (SynLongIdent ([Foo], [], [None]),
+                 /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (6,5--6,8)),
+              /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (6,0--6,8))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [],
+          Some
+            (Internal
+               /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (1,7--1,15)),
+          /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (1,0--6,8),
+          { LeadingKeyword =
+             Module
+               /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (1,0--1,6) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs b/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs
new file mode 100644
index 00000000000..60a37407ffa
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs
@@ -0,0 +1,9 @@
+try
+    let content = tryDownloadFile url
+    Some content
+with
+| ex ->
+    Infrastructure.ReportWarning ex
+    None
+| exx ->
+    None
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs.bsl
new file mode 100644
index 00000000000..baa057a8093
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs.bsl
@@ -0,0 +1,87 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfMultipleSynMatchClause.fs", false,
+      QualifiedNameOfFile RangeOfMultipleSynMatchClause, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfMultipleSynMatchClause], false, AnonModule,
+          [Expr
+             (TryWith
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (content, None), false, None,
+                           /root/RangeOfMultipleSynMatchClause.fs (2,8--2,15)),
+                        None,
+                        App
+                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
+                           /root/RangeOfMultipleSynMatchClause.fs (2,18--2,37)),
+                        /root/RangeOfMultipleSynMatchClause.fs (2,8--2,15),
+                        Yes /root/RangeOfMultipleSynMatchClause.fs (2,4--2,37),
+                        { LeadingKeyword =
+                           Let /root/RangeOfMultipleSynMatchClause.fs (2,4--2,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/RangeOfMultipleSynMatchClause.fs (2,16--2,17) })],
+                    App
+                      (NonAtomic, false, Ident Some, Ident content,
+                       /root/RangeOfMultipleSynMatchClause.fs (3,4--3,16)),
+                    /root/RangeOfMultipleSynMatchClause.fs (2,4--3,16),
+                    { InKeyword = None }),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/RangeOfMultipleSynMatchClause.fs (5,2--5,4)), None,
+                     Sequential
+                       (SuppressNeither, true,
+                        App
+                          (NonAtomic, false,
+                           LongIdent
+                             (false,
+                              SynLongIdent
+                                ([Infrastructure; ReportWarning],
+                                 [/root/RangeOfMultipleSynMatchClause.fs (6,18--6,19)],
+                                 [None; None]), None,
+                              /root/RangeOfMultipleSynMatchClause.fs (6,4--6,32)),
+                           Ident ex,
+                           /root/RangeOfMultipleSynMatchClause.fs (6,4--6,35)),
+                        Ident None,
+                        /root/RangeOfMultipleSynMatchClause.fs (6,4--7,8)),
+                     /root/RangeOfMultipleSynMatchClause.fs (5,2--7,8), Yes,
+                     { ArrowRange =
+                        Some /root/RangeOfMultipleSynMatchClause.fs (5,5--5,7)
+                       BarRange =
+                        Some /root/RangeOfMultipleSynMatchClause.fs (5,0--5,1) });
+                  SynMatchClause
+                    (Named
+                       (SynIdent (exx, None), false, None,
+                        /root/RangeOfMultipleSynMatchClause.fs (8,2--8,5)), None,
+                     Ident None,
+                     /root/RangeOfMultipleSynMatchClause.fs (8,2--9,8), Yes,
+                     { ArrowRange =
+                        Some /root/RangeOfMultipleSynMatchClause.fs (8,6--8,8)
+                       BarRange =
+                        Some /root/RangeOfMultipleSynMatchClause.fs (8,0--8,1) })],
+                 /root/RangeOfMultipleSynMatchClause.fs (1,0--9,8),
+                 Yes /root/RangeOfMultipleSynMatchClause.fs (1,0--1,3),
+                 Yes /root/RangeOfMultipleSynMatchClause.fs (4,0--4,4),
+                 { TryKeyword =
+                    /root/RangeOfMultipleSynMatchClause.fs (1,0--1,3)
+                   TryToWithRange =
+                    /root/RangeOfMultipleSynMatchClause.fs (1,0--4,4)
+                   WithKeyword =
+                    /root/RangeOfMultipleSynMatchClause.fs (4,0--4,4)
+                   WithToEndRange =
+                    /root/RangeOfMultipleSynMatchClause.fs (4,0--9,8) }),
+              /root/RangeOfMultipleSynMatchClause.fs (1,0--9,8))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfMultipleSynMatchClause.fs (1,0--9,8),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi b/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi
new file mode 100644
index 00000000000..c2cf9a77bbf
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi
@@ -0,0 +1,60 @@
+namespace Microsoft.FSharp.Core
+
+open System
+open System.Collections.Generic
+open Microsoft.FSharp.Core
+open Microsoft.FSharp.Collections
+open System.Collections
+
+
+module Tuple =
+
+    type Tuple<'T1,'T2,'T3,'T4> =
+        interface IStructuralEquatable
+        interface IStructuralComparable
+        interface IComparable
+        new : 'T1 * 'T2 * 'T3 * 'T4 -> Tuple<'T1,'T2,'T3,'T4>
+        member Item1 : 'T1 with get
+        member Item2 : 'T2 with get
+        member Item3 : 'T3 with get
+        member Item4 : 'T4 with get
+
+
+module Choice =
+
+    /// <summary>Helper types for active patterns with 6 choices.</summary>
+    [<StructuralEquality; StructuralComparison>]
+    [<CompiledName("FSharpChoice`6")>]
+    type Choice<'T1,'T2,'T3,'T4,'T5,'T6> =
+      /// <summary>Choice 1 of 6 choices</summary>
+      | Choice1Of6 of 'T1
+      /// <summary>Choice 2 of 6 choices</summary>
+      | Choice2Of6 of 'T2
+      /// <summary>Choice 3 of 6 choices</summary>
+      | Choice3Of6 of 'T3
+      /// <summary>Choice 4 of 6 choices</summary>
+      | Choice4Of6 of 'T4
+      /// <summary>Choice 5 of 6 choices</summary>
+      | Choice5Of6 of 'T5
+      /// <summary>Choice 6 of 6 choices</summary>
+      | Choice6Of6 of 'T6
+
+
+
+/// <summary>Basic F# Operators. This module is automatically opened in all F# code.</summary>
+[<AutoOpen>]
+module Operators =
+
+    type ``[,]``<'T> with
+        [<CompiledName("Length1")>]
+        /// <summary>Get the length of an array in the first dimension  </summary>
+        member Length1 : int
+        [<CompiledName("Length2")>]
+        /// <summary>Get the length of the array in the second dimension  </summary>
+        member Length2 : int
+        [<CompiledName("Base1")>]
+        /// <summary>Get the lower bound of the array in the first dimension  </summary>
+        member Base1 : int
+        [<CompiledName("Base2")>]
+        /// <summary>Get the lower bound of the array in the second dimension  </summary>
+        member Base2 : int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
new file mode 100644
index 00000000000..7930052d179
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
@@ -0,0 +1,757 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi",
+      QualifiedNameOfFile
+        RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([Microsoft; FSharp; Core], false, DeclaredNamespace,
+          [Open
+             (ModuleOrNamespace
+                (SynLongIdent ([System], [], [None]),
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (3,5--3,11)),
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (3,0--3,11));
+           Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([System; Collections; Generic],
+                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,11--4,12);
+                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,23--4,24)],
+                    [None; None; None]),
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,5--4,31)),
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,0--4,31));
+           Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([Microsoft; FSharp; Core],
+                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,14--5,15);
+                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,21--5,22)],
+                    [None; None; None]),
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,5--5,26)),
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,0--5,26));
+           Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([Microsoft; FSharp; Collections],
+                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,14--6,15);
+                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,21--6,22)],
+                    [None; None; None]),
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,5--6,33)),
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,0--6,33));
+           Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([System; Collections],
+                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,11--7,12)],
+                    [None; None]),
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,5--7,23)),
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,0--7,23));
+           NestedModule
+             (SynComponentInfo
+                ([], None, [], [Tuple],
+                 PreXmlDoc ((10,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 None,
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (10,0--10,12)),
+              false,
+              [Types
+                 ([SynTypeDefnSig
+                     (SynComponentInfo
+                        ([],
+                         Some
+                           (PostfixList
+                              ([SynTyparDecl ([], SynTypar (T1, None, false));
+                                SynTyparDecl ([], SynTypar (T2, None, false));
+                                SynTyparDecl ([], SynTypar (T3, None, false));
+                                SynTyparDecl ([], SynTypar (T4, None, false))],
+                               [],
+                               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (12,14--12,31))),
+                         [], [Tuple],
+                         PreXmlDoc ((12,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         true, None,
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (12,9--12,14)),
+                      ObjectModel
+                        (Unspecified,
+                         [Interface
+                            (LongIdent
+                               (SynLongIdent
+                                  ([IStructuralEquatable], [], [None])),
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,8--13,38));
+                          Interface
+                            (LongIdent
+                               (SynLongIdent
+                                  ([IStructuralComparable], [], [None])),
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (14,8--14,39));
+                          Interface
+                            (LongIdent
+                               (SynLongIdent ([IComparable], [], [None])),
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (15,8--15,29));
+                          Member
+                            (SynValSig
+                               ([], SynIdent (new, None),
+                                SynValTyparDecls (None, false),
+                                Fun
+                                  (Tuple
+                                     (false,
+                                      [Type
+                                         (Var
+                                            (SynTypar (T1, None, false),
+                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,14--16,17)));
+                                       Star
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,18--16,19);
+                                       Type
+                                         (Var
+                                            (SynTypar (T2, None, false),
+                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,20--16,23)));
+                                       Star
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,24--16,25);
+                                       Type
+                                         (Var
+                                            (SynTypar (T3, None, false),
+                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,26--16,29)));
+                                       Star
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,30--16,31);
+                                       Type
+                                         (Var
+                                            (SynTypar (T4, None, false),
+                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,32--16,35)))],
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,14--16,35)),
+                                   App
+                                     (LongIdent
+                                        (SynLongIdent ([Tuple], [], [None])),
+                                      Some
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,44--16,45),
+                                      [Var
+                                         (SynTypar (T1, None, false),
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,45--16,48));
+                                       Var
+                                         (SynTypar (T2, None, false),
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,49--16,52));
+                                       Var
+                                         (SynTypar (T3, None, false),
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,53--16,56));
+                                       Var
+                                         (SynTypar (T4, None, false),
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,57--16,60))],
+                                      [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,48--16,49);
+                                       /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,52--16,53);
+                                       /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,56--16,57)],
+                                      Some
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,60--16,61),
+                                      false,
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,39--16,61)),
+                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,14--16,61),
+                                   { ArrowRange =
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,36--16,38) }),
+                                SynValInfo
+                                  ([[SynArgInfo ([], false, None);
+                                     SynArgInfo ([], false, None);
+                                     SynArgInfo ([], false, None);
+                                     SynArgInfo ([], false, None)]],
+                                   SynArgInfo ([], false, None)), false, false,
+                                PreXmlDoc ((16,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                None, None,
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,8--16,61),
+                                { LeadingKeyword =
+                                   New
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,8--16,11)
+                                  InlineKeyword = None
+                                  WithKeyword = None
+                                  EqualsRange = None }),
+                             { IsInstance = false
+                               IsDispatchSlot = false
+                               IsOverrideOrExplicitImpl = false
+                               IsFinal = false
+                               GetterOrSetterIsCompilerGenerated = false
+                               MemberKind = Constructor },
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,8--16,61),
+                             { GetSetKeywords = None });
+                          Member
+                            (SynValSig
+                               ([], SynIdent (Item1, None),
+                                SynValTyparDecls (None, true),
+                                Var
+                                  (SynTypar (T1, None, false),
+                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,23--17,26)),
+                                SynValInfo ([], SynArgInfo ([], false, None)),
+                                false, false,
+                                PreXmlDoc ((17,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                None, None,
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,35),
+                                { LeadingKeyword =
+                                   Member
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,14)
+                                  InlineKeyword = None
+                                  WithKeyword =
+                                   Some
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,27--17,31)
+                                  EqualsRange = None }),
+                             { IsInstance = true
+                               IsDispatchSlot = false
+                               IsOverrideOrExplicitImpl = false
+                               IsFinal = false
+                               GetterOrSetterIsCompilerGenerated = false
+                               MemberKind = PropertyGet },
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,35),
+                             { GetSetKeywords =
+                                Some
+                                  (Get
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,32--17,35)) });
+                          Member
+                            (SynValSig
+                               ([], SynIdent (Item2, None),
+                                SynValTyparDecls (None, true),
+                                Var
+                                  (SynTypar (T2, None, false),
+                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,23--18,26)),
+                                SynValInfo ([], SynArgInfo ([], false, None)),
+                                false, false,
+                                PreXmlDoc ((18,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                None, None,
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,35),
+                                { LeadingKeyword =
+                                   Member
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,14)
+                                  InlineKeyword = None
+                                  WithKeyword =
+                                   Some
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,27--18,31)
+                                  EqualsRange = None }),
+                             { IsInstance = true
+                               IsDispatchSlot = false
+                               IsOverrideOrExplicitImpl = false
+                               IsFinal = false
+                               GetterOrSetterIsCompilerGenerated = false
+                               MemberKind = PropertyGet },
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,35),
+                             { GetSetKeywords =
+                                Some
+                                  (Get
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,32--18,35)) });
+                          Member
+                            (SynValSig
+                               ([], SynIdent (Item3, None),
+                                SynValTyparDecls (None, true),
+                                Var
+                                  (SynTypar (T3, None, false),
+                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,23--19,26)),
+                                SynValInfo ([], SynArgInfo ([], false, None)),
+                                false, false,
+                                PreXmlDoc ((19,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                None, None,
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,35),
+                                { LeadingKeyword =
+                                   Member
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,14)
+                                  InlineKeyword = None
+                                  WithKeyword =
+                                   Some
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,27--19,31)
+                                  EqualsRange = None }),
+                             { IsInstance = true
+                               IsDispatchSlot = false
+                               IsOverrideOrExplicitImpl = false
+                               IsFinal = false
+                               GetterOrSetterIsCompilerGenerated = false
+                               MemberKind = PropertyGet },
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,35),
+                             { GetSetKeywords =
+                                Some
+                                  (Get
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,32--19,35)) });
+                          Member
+                            (SynValSig
+                               ([], SynIdent (Item4, None),
+                                SynValTyparDecls (None, true),
+                                Var
+                                  (SynTypar (T4, None, false),
+                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,23--20,26)),
+                                SynValInfo ([], SynArgInfo ([], false, None)),
+                                false, false,
+                                PreXmlDoc ((20,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                None, None,
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,35),
+                                { LeadingKeyword =
+                                   Member
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,14)
+                                  InlineKeyword = None
+                                  WithKeyword =
+                                   Some
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,27--20,31)
+                                  EqualsRange = None }),
+                             { IsInstance = true
+                               IsDispatchSlot = false
+                               IsOverrideOrExplicitImpl = false
+                               IsFinal = false
+                               GetterOrSetterIsCompilerGenerated = false
+                               MemberKind = PropertyGet },
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,35),
+                             { GetSetKeywords =
+                                Some
+                                  (Get
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,32--20,35)) })],
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,8--20,35)),
+                      [],
+                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (12,9--20,35),
+                      { LeadingKeyword =
+                         Type
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (12,4--12,8)
+                        EqualsRange =
+                         Some
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (12,32--12,33)
+                        WithKeyword = None })],
+                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (12,4--20,35))],
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (10,0--20,35),
+              { ModuleKeyword =
+                 Some
+                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (10,0--10,6)
+                EqualsRange =
+                 Some
+                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (10,13--10,14) });
+           NestedModule
+             (SynComponentInfo
+                ([], None, [], [Choice],
+                 PreXmlDoc ((23,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 None,
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (23,0--23,13)),
+              false,
+              [Types
+                 ([SynTypeDefnSig
+                     (SynComponentInfo
+                        ([{ Attributes =
+                             [{ TypeName =
+                                 SynLongIdent ([StructuralEquality], [], [None])
+                                ArgExpr =
+                                 Const
+                                   (Unit,
+                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,6--26,24))
+                                Target = None
+                                AppliesToGetterAndSetter = false
+                                Range =
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,6--26,24) };
+                              { TypeName =
+                                 SynLongIdent
+                                   ([StructuralComparison], [], [None])
+                                ArgExpr =
+                                 Const
+                                   (Unit,
+                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,26--26,46))
+                                Target = None
+                                AppliesToGetterAndSetter = false
+                                Range =
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,26--26,46) }]
+                            Range =
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,4--26,48) };
+                          { Attributes =
+                             [{ TypeName =
+                                 SynLongIdent ([CompiledName], [], [None])
+                                ArgExpr =
+                                 Paren
+                                   (Const
+                                      (String
+                                         ("FSharpChoice`6", Regular,
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,19--27,35)),
+                                       /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,19--27,35)),
+                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,18--27,19),
+                                    Some
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,35--27,36),
+                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,18--27,36))
+                                Target = None
+                                AppliesToGetterAndSetter = false
+                                Range =
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,6--27,36) }]
+                            Range =
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,4--27,38) }],
+                         Some
+                           (PostfixList
+                              ([SynTyparDecl ([], SynTypar (T1, None, false));
+                                SynTyparDecl ([], SynTypar (T2, None, false));
+                                SynTyparDecl ([], SynTypar (T3, None, false));
+                                SynTyparDecl ([], SynTypar (T4, None, false));
+                                SynTyparDecl ([], SynTypar (T5, None, false));
+                                SynTyparDecl ([], SynTypar (T6, None, false))],
+                               [],
+                               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,15--28,40))),
+                         [], [Choice],
+                         PreXmlDoc ((26,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         true, None,
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,9--28,15)),
+                      Simple
+                        (Union
+                           (None,
+                            [SynUnionCase
+                               ([], SynIdent (Choice1Of6, None),
+                                Fields
+                                  [SynField
+                                     ([], false, None,
+                                      Var
+                                        (SynTypar (T1, None, false),
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,22--30,25)),
+                                      false,
+                                      PreXmlDoc ((30,22), FSharp.Compiler.Xml.XmlDocCollector),
+                                      None,
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,22--30,25),
+                                      { LeadingKeyword = None })],
+                                PreXmlDoc ((30,6), FSharp.Compiler.Xml.XmlDocCollector),
+                                None,
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,6--30,25),
+                                { BarRange =
+                                   Some
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,6--30,7) });
+                             SynUnionCase
+                               ([], SynIdent (Choice2Of6, None),
+                                Fields
+                                  [SynField
+                                     ([], false, None,
+                                      Var
+                                        (SynTypar (T2, None, false),
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (32,22--32,25)),
+                                      false,
+                                      PreXmlDoc ((32,22), FSharp.Compiler.Xml.XmlDocCollector),
+                                      None,
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (32,22--32,25),
+                                      { LeadingKeyword = None })],
+                                PreXmlDoc ((32,6), FSharp.Compiler.Xml.XmlDocCollector),
+                                None,
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (31,6--32,25),
+                                { BarRange =
+                                   Some
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (32,6--32,7) });
+                             SynUnionCase
+                               ([], SynIdent (Choice3Of6, None),
+                                Fields
+                                  [SynField
+                                     ([], false, None,
+                                      Var
+                                        (SynTypar (T3, None, false),
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (34,22--34,25)),
+                                      false,
+                                      PreXmlDoc ((34,22), FSharp.Compiler.Xml.XmlDocCollector),
+                                      None,
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (34,22--34,25),
+                                      { LeadingKeyword = None })],
+                                PreXmlDoc ((34,6), FSharp.Compiler.Xml.XmlDocCollector),
+                                None,
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (33,6--34,25),
+                                { BarRange =
+                                   Some
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (34,6--34,7) });
+                             SynUnionCase
+                               ([], SynIdent (Choice4Of6, None),
+                                Fields
+                                  [SynField
+                                     ([], false, None,
+                                      Var
+                                        (SynTypar (T4, None, false),
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (36,22--36,25)),
+                                      false,
+                                      PreXmlDoc ((36,22), FSharp.Compiler.Xml.XmlDocCollector),
+                                      None,
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (36,22--36,25),
+                                      { LeadingKeyword = None })],
+                                PreXmlDoc ((36,6), FSharp.Compiler.Xml.XmlDocCollector),
+                                None,
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (35,6--36,25),
+                                { BarRange =
+                                   Some
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (36,6--36,7) });
+                             SynUnionCase
+                               ([], SynIdent (Choice5Of6, None),
+                                Fields
+                                  [SynField
+                                     ([], false, None,
+                                      Var
+                                        (SynTypar (T5, None, false),
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (38,22--38,25)),
+                                      false,
+                                      PreXmlDoc ((38,22), FSharp.Compiler.Xml.XmlDocCollector),
+                                      None,
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (38,22--38,25),
+                                      { LeadingKeyword = None })],
+                                PreXmlDoc ((38,6), FSharp.Compiler.Xml.XmlDocCollector),
+                                None,
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (37,6--38,25),
+                                { BarRange =
+                                   Some
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (38,6--38,7) });
+                             SynUnionCase
+                               ([], SynIdent (Choice6Of6, None),
+                                Fields
+                                  [SynField
+                                     ([], false, None,
+                                      Var
+                                        (SynTypar (T6, None, false),
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (40,22--40,25)),
+                                      false,
+                                      PreXmlDoc ((40,22), FSharp.Compiler.Xml.XmlDocCollector),
+                                      None,
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (40,22--40,25),
+                                      { LeadingKeyword = None })],
+                                PreXmlDoc ((40,6), FSharp.Compiler.Xml.XmlDocCollector),
+                                None,
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (39,6--40,25),
+                                { BarRange =
+                                   Some
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (40,6--40,7) })],
+                            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,6--40,25)),
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,6--40,25)),
+                      [],
+                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (25,4--40,25),
+                      { LeadingKeyword =
+                         Type
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,4--28,8)
+                        EqualsRange =
+                         Some
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,41--28,42)
+                        WithKeyword = None })],
+                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (25,4--40,25))],
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (23,0--40,25),
+              { ModuleKeyword =
+                 Some
+                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (23,0--23,6)
+                EqualsRange =
+                 Some
+                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (23,14--23,15) });
+           NestedModule
+             (SynComponentInfo
+                ([{ Attributes =
+                     [{ TypeName = SynLongIdent ([AutoOpen], [], [None])
+                        ArgExpr =
+                         Const
+                           (Unit,
+                            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (45,2--45,10))
+                        Target = None
+                        AppliesToGetterAndSetter = false
+                        Range =
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (45,2--45,10) }]
+                    Range =
+                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (45,0--45,12) }],
+                 None, [], [Operators],
+                 PreXmlDoc ((45,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 None,
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,0--46,16)),
+              false,
+              [Types
+                 ([SynTypeDefnSig
+                     (SynComponentInfo
+                        ([],
+                         Some
+                           (PostfixList
+                              ([SynTyparDecl ([], SynTypar (T, None, false))],
+                               [],
+                               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,16--48,20))),
+                         [], [[,]],
+                         PreXmlDoc ((48,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         true, None,
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,9--48,16)),
+                      Simple
+                        (None
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,9--60,26),
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,9--60,26)),
+                      [Member
+                         (SynValSig
+                            ([{ Attributes =
+                                 [{ TypeName =
+                                     SynLongIdent ([CompiledName], [], [None])
+                                    ArgExpr =
+                                     Paren
+                                       (Const
+                                          (String
+                                             ("Length1", Regular,
+                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,23--49,32)),
+                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,23--49,32)),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,22--49,23),
+                                        Some
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,32--49,33),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,22--49,33))
+                                    Target = None
+                                    AppliesToGetterAndSetter = false
+                                    Range =
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,10--49,33) }]
+                                Range =
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,8--49,35) }],
+                             SynIdent (Length1, None),
+                             SynValTyparDecls (None, true),
+                             LongIdent (SynLongIdent ([int], [], [None])),
+                             SynValInfo ([], SynArgInfo ([], false, None)),
+                             false, false,
+                             PreXmlDoc ((49,8), FSharp.Compiler.Xml.XmlDocCollector),
+                             None, None,
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,8--51,28),
+                             { LeadingKeyword =
+                                Member
+                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (51,8--51,14)
+                               InlineKeyword = None
+                               WithKeyword = None
+                               EqualsRange = None }),
+                          { IsInstance = true
+                            IsDispatchSlot = false
+                            IsOverrideOrExplicitImpl = false
+                            IsFinal = false
+                            GetterOrSetterIsCompilerGenerated = false
+                            MemberKind = PropertyGet },
+                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,8--51,28),
+                          { GetSetKeywords = None });
+                       Member
+                         (SynValSig
+                            ([{ Attributes =
+                                 [{ TypeName =
+                                     SynLongIdent ([CompiledName], [], [None])
+                                    ArgExpr =
+                                     Paren
+                                       (Const
+                                          (String
+                                             ("Length2", Regular,
+                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,23--52,32)),
+                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,23--52,32)),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,22--52,23),
+                                        Some
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,32--52,33),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,22--52,33))
+                                    Target = None
+                                    AppliesToGetterAndSetter = false
+                                    Range =
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,10--52,33) }]
+                                Range =
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,8--52,35) }],
+                             SynIdent (Length2, None),
+                             SynValTyparDecls (None, true),
+                             LongIdent (SynLongIdent ([int], [], [None])),
+                             SynValInfo ([], SynArgInfo ([], false, None)),
+                             false, false,
+                             PreXmlDoc ((52,8), FSharp.Compiler.Xml.XmlDocCollector),
+                             None, None,
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,8--54,28),
+                             { LeadingKeyword =
+                                Member
+                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (54,8--54,14)
+                               InlineKeyword = None
+                               WithKeyword = None
+                               EqualsRange = None }),
+                          { IsInstance = true
+                            IsDispatchSlot = false
+                            IsOverrideOrExplicitImpl = false
+                            IsFinal = false
+                            GetterOrSetterIsCompilerGenerated = false
+                            MemberKind = PropertyGet },
+                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,8--54,28),
+                          { GetSetKeywords = None });
+                       Member
+                         (SynValSig
+                            ([{ Attributes =
+                                 [{ TypeName =
+                                     SynLongIdent ([CompiledName], [], [None])
+                                    ArgExpr =
+                                     Paren
+                                       (Const
+                                          (String
+                                             ("Base1", Regular,
+                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,23--55,30)),
+                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,23--55,30)),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,22--55,23),
+                                        Some
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,30--55,31),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,22--55,31))
+                                    Target = None
+                                    AppliesToGetterAndSetter = false
+                                    Range =
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,10--55,31) }]
+                                Range =
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,8--55,33) }],
+                             SynIdent (Base1, None),
+                             SynValTyparDecls (None, true),
+                             LongIdent (SynLongIdent ([int], [], [None])),
+                             SynValInfo ([], SynArgInfo ([], false, None)),
+                             false, false,
+                             PreXmlDoc ((55,8), FSharp.Compiler.Xml.XmlDocCollector),
+                             None, None,
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,8--57,26),
+                             { LeadingKeyword =
+                                Member
+                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (57,8--57,14)
+                               InlineKeyword = None
+                               WithKeyword = None
+                               EqualsRange = None }),
+                          { IsInstance = true
+                            IsDispatchSlot = false
+                            IsOverrideOrExplicitImpl = false
+                            IsFinal = false
+                            GetterOrSetterIsCompilerGenerated = false
+                            MemberKind = PropertyGet },
+                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,8--57,26),
+                          { GetSetKeywords = None });
+                       Member
+                         (SynValSig
+                            ([{ Attributes =
+                                 [{ TypeName =
+                                     SynLongIdent ([CompiledName], [], [None])
+                                    ArgExpr =
+                                     Paren
+                                       (Const
+                                          (String
+                                             ("Base2", Regular,
+                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,23--58,30)),
+                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,23--58,30)),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,22--58,23),
+                                        Some
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,30--58,31),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,22--58,31))
+                                    Target = None
+                                    AppliesToGetterAndSetter = false
+                                    Range =
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,10--58,31) }]
+                                Range =
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,8--58,33) }],
+                             SynIdent (Base2, None),
+                             SynValTyparDecls (None, true),
+                             LongIdent (SynLongIdent ([int], [], [None])),
+                             SynValInfo ([], SynArgInfo ([], false, None)),
+                             false, false,
+                             PreXmlDoc ((58,8), FSharp.Compiler.Xml.XmlDocCollector),
+                             None, None,
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,8--60,26),
+                             { LeadingKeyword =
+                                Member
+                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (60,8--60,14)
+                               InlineKeyword = None
+                               WithKeyword = None
+                               EqualsRange = None }),
+                          { IsInstance = true
+                            IsDispatchSlot = false
+                            IsOverrideOrExplicitImpl = false
+                            IsFinal = false
+                            GetterOrSetterIsCompilerGenerated = false
+                            MemberKind = PropertyGet },
+                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,8--60,26),
+                          { GetSetKeywords = None })],
+                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,9--60,26),
+                      { LeadingKeyword =
+                         Type
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,4--48,8)
+                        EqualsRange = None
+                        WithKeyword =
+                         Some
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,21--48,25) })],
+                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,4--60,26))],
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (44,0--60,26),
+              { ModuleKeyword =
+                 Some
+                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,0--46,6)
+                EqualsRange =
+                 Some
+                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,17--46,18) })],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (1,0--60,26),
+          { LeadingKeyword =
+             Namespace
+               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,8--50,82);
+          LineComment
+            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,8--53,84);
+          LineComment
+            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,8--56,88);
+          LineComment
+            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,8--59,89)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs
new file mode 100644
index 00000000000..71c265303f2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs
@@ -0,0 +1,6 @@
+try
+    let content = tryDownloadFile url
+    Some content
+with ex ->
+    Infrastructure.ReportWarning ex
+    None
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs.bsl
new file mode 100644
index 00000000000..bf5fee37687
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs.bsl
@@ -0,0 +1,73 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfSingleSynMatchClause.fs", false,
+      QualifiedNameOfFile RangeOfSingleSynMatchClause, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfSingleSynMatchClause], false, AnonModule,
+          [Expr
+             (TryWith
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (content, None), false, None,
+                           /root/RangeOfSingleSynMatchClause.fs (2,8--2,15)),
+                        None,
+                        App
+                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
+                           /root/RangeOfSingleSynMatchClause.fs (2,18--2,37)),
+                        /root/RangeOfSingleSynMatchClause.fs (2,8--2,15),
+                        Yes /root/RangeOfSingleSynMatchClause.fs (2,4--2,37),
+                        { LeadingKeyword =
+                           Let /root/RangeOfSingleSynMatchClause.fs (2,4--2,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/RangeOfSingleSynMatchClause.fs (2,16--2,17) })],
+                    App
+                      (NonAtomic, false, Ident Some, Ident content,
+                       /root/RangeOfSingleSynMatchClause.fs (3,4--3,16)),
+                    /root/RangeOfSingleSynMatchClause.fs (2,4--3,16),
+                    { InKeyword = None }),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/RangeOfSingleSynMatchClause.fs (4,5--4,7)), None,
+                     Sequential
+                       (SuppressNeither, true,
+                        App
+                          (NonAtomic, false,
+                           LongIdent
+                             (false,
+                              SynLongIdent
+                                ([Infrastructure; ReportWarning],
+                                 [/root/RangeOfSingleSynMatchClause.fs (5,18--5,19)],
+                                 [None; None]), None,
+                              /root/RangeOfSingleSynMatchClause.fs (5,4--5,32)),
+                           Ident ex,
+                           /root/RangeOfSingleSynMatchClause.fs (5,4--5,35)),
+                        Ident None,
+                        /root/RangeOfSingleSynMatchClause.fs (5,4--6,8)),
+                     /root/RangeOfSingleSynMatchClause.fs (4,5--6,8), Yes,
+                     { ArrowRange =
+                        Some /root/RangeOfSingleSynMatchClause.fs (4,8--4,10)
+                       BarRange = None })],
+                 /root/RangeOfSingleSynMatchClause.fs (1,0--6,8),
+                 Yes /root/RangeOfSingleSynMatchClause.fs (1,0--1,3),
+                 Yes /root/RangeOfSingleSynMatchClause.fs (4,0--4,4),
+                 { TryKeyword = /root/RangeOfSingleSynMatchClause.fs (1,0--1,3)
+                   TryToWithRange =
+                    /root/RangeOfSingleSynMatchClause.fs (1,0--4,4)
+                   WithKeyword = /root/RangeOfSingleSynMatchClause.fs (4,0--4,4)
+                   WithToEndRange =
+                    /root/RangeOfSingleSynMatchClause.fs (4,0--6,8) }),
+              /root/RangeOfSingleSynMatchClause.fs (1,0--6,8))], PreXmlDocEmpty,
+          [], None, /root/RangeOfSingleSynMatchClause.fs (1,0--6,8),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs
new file mode 100644
index 00000000000..fd16b308f98
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs
@@ -0,0 +1,7 @@
+try
+    let content = tryDownloadFile url
+    Some content
+with
+| ex ->
+    ()
+|
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
new file mode 100644
index 00000000000..4ea2ec2d054
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
@@ -0,0 +1,73 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfSingleSynMatchClauseFollowedByBar.fs", false,
+      QualifiedNameOfFile RangeOfSingleSynMatchClauseFollowedByBar, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfSingleSynMatchClauseFollowedByBar], false, AnonModule,
+          [Expr
+             (TryWith
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (content, None), false, None,
+                           /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,8--2,15)),
+                        None,
+                        App
+                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
+                           /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,18--2,37)),
+                        /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,8--2,15),
+                        Yes
+                          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,4--2,37),
+                        { LeadingKeyword =
+                           Let
+                             /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,4--2,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,16--2,17) })],
+                    App
+                      (NonAtomic, false, Ident Some, Ident content,
+                       /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,4--3,16)),
+                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,4--3,16),
+                    { InKeyword = None }),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,2--5,4)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,4--6,6)),
+                     /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,2--6,6),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,5--5,7)
+                       BarRange =
+                        Some
+                          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,0--5,1) })],
+                 /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (1,0--7,1),
+                 Yes
+                   /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (1,0--1,3),
+                 Yes
+                   /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (4,0--4,4),
+                 { TryKeyword =
+                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (1,0--1,3)
+                   TryToWithRange =
+                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (1,0--4,4)
+                   WithKeyword =
+                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (4,0--4,4)
+                   WithToEndRange =
+                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (4,0--7,1) }),
+              /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (1,0--7,1))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (1,0--7,1),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs
new file mode 100644
index 00000000000..88fe1fe6738
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs
@@ -0,0 +1,5 @@
+try
+    let content = tryDownloadFile url
+    Some content
+with
+| ex ->
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
new file mode 100644
index 00000000000..ae0657ac519
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
@@ -0,0 +1,71 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfSingleSynMatchClauseWithMissingBody.fs", false,
+      QualifiedNameOfFile RangeOfSingleSynMatchClauseWithMissingBody, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfSingleSynMatchClauseWithMissingBody], false, AnonModule,
+          [Expr
+             (TryWith
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (content, None), false, None,
+                           /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,8--2,15)),
+                        None,
+                        App
+                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
+                           /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,18--2,37)),
+                        /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,8--2,15),
+                        Yes
+                          /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,4--2,37),
+                        { LeadingKeyword =
+                           Let
+                             /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,4--2,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,16--2,17) })],
+                    App
+                      (NonAtomic, false, Ident Some, Ident content,
+                       /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,4--3,16)),
+                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,4--3,16),
+                    { InKeyword = None }),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,2--5,4)),
+                     None,
+                     ArbitraryAfterError
+                       ("patternClauses2",
+                        /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,4--5,4)),
+                     /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,2--5,4),
+                     Yes,
+                     { ArrowRange = None
+                       BarRange =
+                        Some
+                          /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,0--5,1) })],
+                 /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (1,0--5,4),
+                 Yes
+                   /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (1,0--1,3),
+                 Yes
+                   /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (4,0--4,4),
+                 { TryKeyword =
+                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (1,0--1,3)
+                   TryToWithRange =
+                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (1,0--4,4)
+                   WithKeyword =
+                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (4,0--4,4)
+                   WithToEndRange =
+                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (4,0--5,4) }),
+              /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (1,0--5,4))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (1,0--5,7),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs
new file mode 100644
index 00000000000..6bdda262153
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs
@@ -0,0 +1,5 @@
+try
+    let content = tryDownloadFile url
+    Some content
+with
+| ex when (isNull ex) ->
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
new file mode 100644
index 00000000000..911289c12f7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
@@ -0,0 +1,81 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs", false,
+      QualifiedNameOfFile RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr], false,
+          AnonModule,
+          [Expr
+             (TryWith
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (content, None), false, None,
+                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,8--2,15)),
+                        None,
+                        App
+                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
+                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,18--2,37)),
+                        /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,8--2,15),
+                        Yes
+                          /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,4--2,37),
+                        { LeadingKeyword =
+                           Let
+                             /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,4--2,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,16--2,17) })],
+                    App
+                      (NonAtomic, false, Ident Some, Ident content,
+                       /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,4--3,16)),
+                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,4--3,16),
+                    { InKeyword = None }),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,2--5,4)),
+                     Some
+                       (Paren
+                          (App
+                             (NonAtomic, false, Ident isNull, Ident ex,
+                              /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,11--5,20)),
+                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,10--5,11),
+                           Some
+                             /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,20--5,21),
+                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,10--5,21))),
+                     ArbitraryAfterError
+                       ("patternClauses2",
+                        /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,21--5,21)),
+                     /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,2--5,21),
+                     Yes,
+                     { ArrowRange = None
+                       BarRange =
+                        Some
+                          /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,0--5,1) })],
+                 /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (1,0--5,21),
+                 Yes
+                   /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (1,0--1,3),
+                 Yes
+                   /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (4,0--4,4),
+                 { TryKeyword =
+                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (1,0--1,3)
+                   TryToWithRange =
+                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (1,0--4,4)
+                   WithKeyword =
+                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (4,0--4,4)
+                   WithToEndRange =
+                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (4,0--5,21) }),
+              /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (1,0--5,21))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (1,0--5,24),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi
new file mode 100644
index 00000000000..a19e0a87714
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi
@@ -0,0 +1,3 @@
+namespace Y
+type MyFunction =
+    delegate of int -> string
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
new file mode 100644
index 00000000000..54ae1c87b83
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
@@ -0,0 +1,70 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi",
+      QualifiedNameOfFile RangeOfSynTypeDefnSigDelegateOfShouldStartFromName, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([Y], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [MyFunction],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,5--2,15)),
+                  ObjectModel
+                    (Delegate
+                       (Fun
+                          (LongIdent (SynLongIdent ([int], [], [None])),
+                           LongIdent (SynLongIdent ([string], [], [None])),
+                           /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,16--3,29),
+                           { ArrowRange =
+                              /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,20--3,22) }),
+                        SynValInfo
+                          ([[SynArgInfo ([], false, None)]],
+                           SynArgInfo ([], false, None))),
+                     [Member
+                        (SynValSig
+                           ([], SynIdent (Invoke, None),
+                            SynValTyparDecls (None, true),
+                            Fun
+                              (LongIdent (SynLongIdent ([int], [], [None])),
+                               LongIdent (SynLongIdent ([string], [], [None])),
+                               /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,16--3,29),
+                               { ArrowRange =
+                                  /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,20--3,22) }),
+                            SynValInfo
+                              ([[SynArgInfo ([], false, None)]],
+                               SynArgInfo ([], false, None)), false, false,
+                            PreXmlDocEmpty, None, None,
+                            /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,4--3,29),
+                            { LeadingKeyword = Synthetic
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = Member },
+                         /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,4--3,29),
+                         { GetSetKeywords = None })],
+                     /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,4--3,29)),
+                  [],
+                  /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,5--3,29),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,16--2,17)
+                    WithKeyword = None })],
+              /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,0--3,29))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (1,0--3,29),
+          { LeadingKeyword =
+             Namespace
+               /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi
new file mode 100644
index 00000000000..9a51ffef4b7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi
@@ -0,0 +1,5 @@
+namespace X
+type MyRecord =
+    class
+    end
+    member Score : unit -> int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
new file mode 100644
index 00000000000..9c1b9ef85ae
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
@@ -0,0 +1,63 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi",
+      QualifiedNameOfFile RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember,
+      [], [],
+      [SynModuleOrNamespaceSig
+         ([X], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [MyRecord],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,5--2,13)),
+                  ObjectModel
+                    (Class, [],
+                     /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,4--4,7)),
+                  [Member
+                     (SynValSig
+                        ([], SynIdent (Score, None),
+                         SynValTyparDecls (None, true),
+                         Fun
+                           (LongIdent (SynLongIdent ([unit], [], [None])),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (5,19--5,30),
+                            { ArrowRange =
+                               /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (5,24--5,26) }),
+                         SynValInfo
+                           ([[SynArgInfo ([], false, None)]],
+                            SynArgInfo ([], false, None)), false, false,
+                         PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None, None,
+                         /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (5,4--5,30),
+                         { LeadingKeyword =
+                            Member
+                              /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (5,4--5,10)
+                           InlineKeyword = None
+                           WithKeyword = None
+                           EqualsRange = None }),
+                      { IsInstance = true
+                        IsDispatchSlot = false
+                        IsOverrideOrExplicitImpl = false
+                        IsFinal = false
+                        GetterOrSetterIsCompilerGenerated = false
+                        MemberKind = Member },
+                      /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (5,4--5,30),
+                      { GetSetKeywords = None })],
+                  /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,5--5,30),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,14--2,15)
+                    WithKeyword = None })],
+              /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,0--5,30))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (1,0--5,30),
+          { LeadingKeyword =
+             Namespace
+               /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi
new file mode 100644
index 00000000000..fa01c200519
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi
@@ -0,0 +1,4 @@
+namespace X
+type MyRecord =
+    { Level: int }
+    member Score : unit -> int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
new file mode 100644
index 00000000000..3283c0238e3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
@@ -0,0 +1,72 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi",
+      QualifiedNameOfFile RangeOfSynTypeDefnSigRecordShouldEndAtLastMember, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([X], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [MyRecord],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,5--2,13)),
+                  Simple
+                    (Record
+                       (None,
+                        [SynField
+                           ([], false, Some Level,
+                            LongIdent (SynLongIdent ([int], [], [None])), false,
+                            PreXmlDoc ((3,6), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,6--3,16),
+                            { LeadingKeyword = None })],
+                        /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,4--3,18)),
+                     /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,4--3,18)),
+                  [Member
+                     (SynValSig
+                        ([], SynIdent (Score, None),
+                         SynValTyparDecls (None, true),
+                         Fun
+                           (LongIdent (SynLongIdent ([unit], [], [None])),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,19--4,30),
+                            { ArrowRange =
+                               /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,24--4,26) }),
+                         SynValInfo
+                           ([[SynArgInfo ([], false, None)]],
+                            SynArgInfo ([], false, None)), false, false,
+                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None, None,
+                         /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,4--4,30),
+                         { LeadingKeyword =
+                            Member
+                              /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,4--4,10)
+                           InlineKeyword = None
+                           WithKeyword = None
+                           EqualsRange = None }),
+                      { IsInstance = true
+                        IsDispatchSlot = false
+                        IsOverrideOrExplicitImpl = false
+                        IsFinal = false
+                        GetterOrSetterIsCompilerGenerated = false
+                        MemberKind = Member },
+                      /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,4--4,30),
+                      { GetSetKeywords = None })],
+                  /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,5--4,30),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,14--2,15)
+                    WithKeyword = None })],
+              /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,0--4,30))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (1,0--4,30),
+          { LeadingKeyword =
+             Namespace
+               /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi
new file mode 100644
index 00000000000..5965da40bba
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi
@@ -0,0 +1,4 @@
+namespace Z
+type SomeCollection with
+    val LastIndex : int
+    val SomeThingElse : int -> string
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
new file mode 100644
index 00000000000..30be3c8a341
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
@@ -0,0 +1,63 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi",
+      QualifiedNameOfFile RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal, [], [],
+      [SynModuleOrNamespaceSig
+         ([Z], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [SomeCollection],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,5--2,19)),
+                  Simple
+                    (None
+                       /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,5--4,37),
+                     /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,5--4,37)),
+                  [ValField
+                     (SynField
+                        ([], false, Some LastIndex,
+                         LongIdent (SynLongIdent ([int], [], [None])), false,
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None,
+                         /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,4--3,23),
+                         { LeadingKeyword =
+                            Some
+                              (Val
+                                 /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,4--3,7)) }),
+                      /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,4--3,23));
+                   ValField
+                     (SynField
+                        ([], false, Some SomeThingElse,
+                         Fun
+                           (LongIdent (SynLongIdent ([int], [], [None])),
+                            LongIdent (SynLongIdent ([string], [], [None])),
+                            /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,24--4,37),
+                            { ArrowRange =
+                               /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,28--4,30) }),
+                         false,
+                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None,
+                         /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,37),
+                         { LeadingKeyword =
+                            Some
+                              (Val
+                                 /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,7)) }),
+                      /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,37))],
+                  /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,5--4,37),
+                  { LeadingKeyword =
+                     Type
+                       /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,0--2,4)
+                    EqualsRange = None
+                    WithKeyword =
+                     Some
+                       /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,20--2,24) })],
+              /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,0--4,37))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (1,0--4,37),
+          { LeadingKeyword =
+             Namespace
+               /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi b/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi
new file mode 100644
index 00000000000..990511b5d81
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi
@@ -0,0 +1,8 @@
+namespace GreatProjectThing
+
+type Meh =
+        class
+        end
+
+
+// foo
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
new file mode 100644
index 00000000000..8adc3416a58
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
@@ -0,0 +1,31 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/RangeOfTypeShouldEndAtEndKeyword.fsi",
+      QualifiedNameOfFile RangeOfTypeShouldEndAtEndKeyword, [], [],
+      [SynModuleOrNamespaceSig
+         ([GreatProjectThing], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Meh],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/RangeOfTypeShouldEndAtEndKeyword.fsi (3,5--3,8)),
+                  ObjectModel
+                    (Class, [],
+                     /root/RangeOfTypeShouldEndAtEndKeyword.fsi (4,8--5,11)), [],
+                  /root/RangeOfTypeShouldEndAtEndKeyword.fsi (3,5--5,11),
+                  { LeadingKeyword =
+                     Type /root/RangeOfTypeShouldEndAtEndKeyword.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some /root/RangeOfTypeShouldEndAtEndKeyword.fsi (3,9--3,10)
+                    WithKeyword = None })],
+              /root/RangeOfTypeShouldEndAtEndKeyword.fsi (3,0--5,11))],
+          PreXmlDocEmpty, [], None,
+          /root/RangeOfTypeShouldEndAtEndKeyword.fsi (1,0--5,11),
+          { LeadingKeyword =
+             Namespace /root/RangeOfTypeShouldEndAtEndKeyword.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/RangeOfTypeShouldEndAtEndKeyword.fsi (8,0--8,6)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
new file mode 100644
index 00000000000..68f597f45be
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
@@ -0,0 +1,3 @@
+type Foo() =
+    // A read-only property.
+    member this.MyReadProperty with get () = myInternalValue
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
new file mode 100644
index 00000000000..75bff088506
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -0,0 +1,107 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword],
+          false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                         None,
+                         PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                         { AsKeyword = None });
+                      GetSetMember
+                        (Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertyGet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)]; []],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([this; MyReadProperty],
+                                     [/root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,15--3,16)],
+                                     [None; None]), Some get, None,
+                                  Pats
+                                    [Paren
+                                       (Const
+                                          (Unit,
+                                           /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,40--3,42)),
+                                        /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,40--3,42))],
+                                  None,
+                                  /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,36--3,42)),
+                               None, Ident myInternalValue,
+                               /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,36--3,42),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,43--3,44) })),
+                         None,
+                         /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,60),
+                         { InlineKeyword = None
+                           WithKeyword =
+                            /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,31--3,35)
+                           GetKeyword =
+                            Some
+                              /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,36--3,39)
+                           AndKeyword = None
+                           SetKeyword = None })],
+                     /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,60)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                        None,
+                        PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                        { AsKeyword = None })),
+                  /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--3,60),
+                  { LeadingKeyword =
+                     Type
+                       /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,11--1,12)
+                    WithKeyword = None })],
+              /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--3,60))],
+          PreXmlDocEmpty, [], None,
+          /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--3,60),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,4--2,28)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
new file mode 100644
index 00000000000..358e2d3401e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
@@ -0,0 +1,5 @@
+type Foo() =
+    // A read-write property.
+    member this.MyReadWriteProperty
+        with get () = myInternalValue
+        and set (value) = myInternalValue <- value
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
new file mode 100644
index 00000000000..70113df7ff9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -0,0 +1,154 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword],
+          false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                         None,
+                         PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                         { AsKeyword = None });
+                      GetSetMember
+                        (Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertyGet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)]; []],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([this; MyReadWriteProperty],
+                                     [/root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,15--3,16)],
+                                     [None; None]), Some get, None,
+                                  Pats
+                                    [Paren
+                                       (Const
+                                          (Unit,
+                                           /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,17--4,19)),
+                                        /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,17--4,19))],
+                                  None,
+                                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,13--4,19)),
+                               None, Ident myInternalValue,
+                               /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,13--4,19),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,20--4,21) })),
+                         Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertySet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)];
+                                      [SynArgInfo ([], false, Some value)]],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([this; MyReadWriteProperty],
+                                     [/root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,15--3,16)],
+                                     [None; None]), Some set, None,
+                                  Pats
+                                    [Paren
+                                       (Named
+                                          (SynIdent (value, None), false, None,
+                                           /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,17--5,22)),
+                                        /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,16--5,23))],
+                                  None,
+                                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,12--5,23)),
+                               None,
+                               LongIdentSet
+                                 (SynLongIdent ([myInternalValue], [], [None]),
+                                  Ident value,
+                                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,26--5,50)),
+                               /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,12--5,23),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,24--5,25) })),
+                         /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--5,50),
+                         { InlineKeyword = None
+                           WithKeyword =
+                            /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,8--4,12)
+                           GetKeyword =
+                            Some
+                              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,13--4,16)
+                           AndKeyword =
+                            Some
+                              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,8--5,11)
+                           SetKeyword =
+                            Some
+                              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,12--5,15) })],
+                     /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--5,50)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                        None,
+                        PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                        { AsKeyword = None })),
+                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--5,50),
+                  { LeadingKeyword =
+                     Type
+                       /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,11--1,12)
+                    WithKeyword = None })],
+              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--5,50))],
+          PreXmlDocEmpty, [], None,
+          /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--5,50),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,4--2,29)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs b/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs
new file mode 100644
index 00000000000..28d0a8f682d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs
@@ -0,0 +1 @@
+#I \"/tmp\"
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs.bsl
new file mode 100644
index 00000000000..2e3c88281dd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs.bsl
@@ -0,0 +1,16 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/RegularStringAsParsedHashDirectiveArgument.fs", false,
+      QualifiedNameOfFile RegularStringAsParsedHashDirectiveArgument, [], [],
+      [SynModuleOrNamespace
+         ([RegularStringAsParsedHashDirectiveArgument], false, AnonModule,
+          [HashDirective
+             (ParsedHashDirective
+                ("I", [],
+                 /root/RegularStringAsParsedHashDirectiveArgument.fs (1,0--1,2)),
+              /root/RegularStringAsParsedHashDirectiveArgument.fs (1,0--1,4))],
+          PreXmlDocEmpty, [], None,
+          /root/RegularStringAsParsedHashDirectiveArgument.fs (1,0--1,4),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi b/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi
new file mode 100644
index 00000000000..5200f8832c5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi
@@ -0,0 +1,7 @@
+module Meh
+
+type X =
+    // MemberSig.Member
+    member Y : int
+                    with
+                                get
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi.bsl b/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi.bsl
new file mode 100644
index 00000000000..9327a566e57
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi.bsl
@@ -0,0 +1,55 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SignatureMemberWithGet.fsi", QualifiedNameOfFile Meh, [], [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, NamedModule,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/SignatureMemberWithGet.fsi (3,5--3,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynValSig
+                           ([], SynIdent (Y, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SignatureMemberWithGet.fsi (5,4--7,35),
+                            { LeadingKeyword =
+                               Member
+                                 /root/SignatureMemberWithGet.fsi (5,4--5,10)
+                              InlineKeyword = None
+                              WithKeyword =
+                               Some
+                                 /root/SignatureMemberWithGet.fsi (6,20--6,24)
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/SignatureMemberWithGet.fsi (5,4--7,35),
+                         { GetSetKeywords =
+                            Some
+                              (Get /root/SignatureMemberWithGet.fsi (7,32--7,35)) })],
+                     /root/SignatureMemberWithGet.fsi (5,4--7,35)), [],
+                  /root/SignatureMemberWithGet.fsi (3,5--7,35),
+                  { LeadingKeyword =
+                     Type /root/SignatureMemberWithGet.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some /root/SignatureMemberWithGet.fsi (3,7--3,8)
+                    WithKeyword = None })],
+              /root/SignatureMemberWithGet.fsi (3,0--7,35))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/SignatureMemberWithGet.fsi (1,0--7,35),
+          { LeadingKeyword = Module /root/SignatureMemberWithGet.fsi (1,0--1,6) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/SignatureMemberWithGet.fsi (4,4--4,23)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi b/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi
new file mode 100644
index 00000000000..d081b432e66
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi
@@ -0,0 +1,7 @@
+module Meh
+
+type X =
+    // MemberSig.Member
+    member Y : int
+                    with
+                            set  ,  get
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi.bsl b/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi.bsl
new file mode 100644
index 00000000000..503931f8b7e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi.bsl
@@ -0,0 +1,60 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SignatureMemberWithSet,get.fsi", QualifiedNameOfFile Meh, [], [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, NamedModule,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SignatureMemberWithSet,get.fsi (3,5--3,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynValSig
+                           ([], SynIdent (Y, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SignatureMemberWithSet,get.fsi (5,4--7,39),
+                            { LeadingKeyword =
+                               Member
+                                 /root/SignatureMemberWithSet,get.fsi (5,4--5,10)
+                              InlineKeyword = None
+                              WithKeyword =
+                               Some
+                                 /root/SignatureMemberWithSet,get.fsi (6,20--6,24)
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGetSet },
+                         /root/SignatureMemberWithSet,get.fsi (5,4--7,39),
+                         { GetSetKeywords =
+                            Some
+                              (GetSet
+                                 (/root/SignatureMemberWithSet,get.fsi (7,36--7,39),
+                                  /root/SignatureMemberWithSet,get.fsi (7,28--7,31))) })],
+                     /root/SignatureMemberWithSet,get.fsi (5,4--7,39)), [],
+                  /root/SignatureMemberWithSet,get.fsi (3,5--7,39),
+                  { LeadingKeyword =
+                     Type /root/SignatureMemberWithSet,get.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some /root/SignatureMemberWithSet,get.fsi (3,7--3,8)
+                    WithKeyword = None })],
+              /root/SignatureMemberWithSet,get.fsi (3,0--7,39))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/SignatureMemberWithSet,get.fsi (1,0--7,39),
+          { LeadingKeyword =
+             Module /root/SignatureMemberWithSet,get.fsi (1,0--1,6) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/SignatureMemberWithSet,get.fsi (4,4--4,23)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi b/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi
new file mode 100644
index 00000000000..9fa04282c33
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi
@@ -0,0 +1,7 @@
+module Meh
+
+type X =
+    // MemberSig.Member
+    member Y : int
+                    with
+                            set
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi.bsl b/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi.bsl
new file mode 100644
index 00000000000..31913973448
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi.bsl
@@ -0,0 +1,55 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SignatureMemberWithSet.fsi", QualifiedNameOfFile Meh, [], [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, NamedModule,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/SignatureMemberWithSet.fsi (3,5--3,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynValSig
+                           ([], SynIdent (Y, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SignatureMemberWithSet.fsi (5,4--7,31),
+                            { LeadingKeyword =
+                               Member
+                                 /root/SignatureMemberWithSet.fsi (5,4--5,10)
+                              InlineKeyword = None
+                              WithKeyword =
+                               Some
+                                 /root/SignatureMemberWithSet.fsi (6,20--6,24)
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertySet },
+                         /root/SignatureMemberWithSet.fsi (5,4--7,31),
+                         { GetSetKeywords =
+                            Some
+                              (Set /root/SignatureMemberWithSet.fsi (7,28--7,31)) })],
+                     /root/SignatureMemberWithSet.fsi (5,4--7,31)), [],
+                  /root/SignatureMemberWithSet.fsi (3,5--7,31),
+                  { LeadingKeyword =
+                     Type /root/SignatureMemberWithSet.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some /root/SignatureMemberWithSet.fsi (3,7--3,8)
+                    WithKeyword = None })],
+              /root/SignatureMemberWithSet.fsi (3,0--7,31))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/SignatureMemberWithSet.fsi (1,0--7,31),
+          { LeadingKeyword = Module /root/SignatureMemberWithSet.fsi (1,0--1,6) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/SignatureMemberWithSet.fsi (4,4--4,23)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs
new file mode 100644
index 00000000000..c9358583520
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs
@@ -0,0 +1 @@
+fun x -> x
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs.bsl
new file mode 100644
index 00000000000..3f9c1aae155
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs.bsl
@@ -0,0 +1,26 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SimpleLambdaHasArrowRange.fs", false,
+      QualifiedNameOfFile SimpleLambdaHasArrowRange, [], [],
+      [SynModuleOrNamespace
+         ([SimpleLambdaHasArrowRange], false, AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (x, None, false, false, false,
+                        /root/SimpleLambdaHasArrowRange.fs (1,4--1,5))],
+                    /root/SimpleLambdaHasArrowRange.fs (1,4--1,5)), Ident x,
+                 Some
+                   ([Named
+                       (SynIdent (x, None), false, None,
+                        /root/SimpleLambdaHasArrowRange.fs (1,4--1,5))], Ident x),
+                 /root/SimpleLambdaHasArrowRange.fs (1,0--1,10),
+                 { ArrowRange =
+                    Some /root/SimpleLambdaHasArrowRange.fs (1,6--1,8) }),
+              /root/SimpleLambdaHasArrowRange.fs (1,0--1,10))], PreXmlDocEmpty,
+          [], None, /root/SimpleLambdaHasArrowRange.fs (1,0--1,10),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi b/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi
new file mode 100644
index 00000000000..48867256ceb
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi
@@ -0,0 +1,8 @@
+namespace Foobar
+
+val v : int =
+    #if DEBUG
+    30
+    #else
+    42
+    #endif
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi.bsl
new file mode 100644
index 00000000000..7bbb6a63531
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi.bsl
@@ -0,0 +1,35 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SingleIfElseEndif,SignatureFile.fsi",
+      QualifiedNameOfFile SingleIfElseEndif,SignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Foobar], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (v, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 Some
+                   (Const
+                      (Int32 42,
+                       /root/SingleIfElseEndif,SignatureFile.fsi (7,4--7,6))),
+                 /root/SingleIfElseEndif,SignatureFile.fsi (3,0--7,6),
+                 { LeadingKeyword =
+                    Val /root/SingleIfElseEndif,SignatureFile.fsi (3,0--3,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange =
+                    Some /root/SingleIfElseEndif,SignatureFile.fsi (3,12--3,13) }),
+              /root/SingleIfElseEndif,SignatureFile.fsi (3,0--7,6))],
+          PreXmlDocEmpty, [], None,
+          /root/SingleIfElseEndif,SignatureFile.fsi (1,0--7,6),
+          { LeadingKeyword =
+             Namespace /root/SingleIfElseEndif,SignatureFile.fsi (1,0--1,9) })],
+      { ConditionalDirectives =
+         [If
+            (Ident "DEBUG",
+             /root/SingleIfElseEndif,SignatureFile.fsi (4,4--4,13));
+          Else /root/SingleIfElseEndif,SignatureFile.fsi (6,4--6,9);
+          EndIf /root/SingleIfElseEndif,SignatureFile.fsi (8,4--8,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfElseEndif.fs b/tests/service/data/SyntaxTree/SingleIfElseEndif.fs
new file mode 100644
index 00000000000..24d95ae6e12
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleIfElseEndif.fs
@@ -0,0 +1,6 @@
+let v =
+    #if DEBUG
+    30
+    #else
+    42
+    #endif
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/SingleIfElseEndif.fs.bsl
new file mode 100644
index 00000000000..749608c7bd1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleIfElseEndif.fs.bsl
@@ -0,0 +1,30 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SingleIfElseEndif.fs", false, QualifiedNameOfFile SingleIfElseEndif,
+      [], [],
+      [SynModuleOrNamespace
+         ([SingleIfElseEndif], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/SingleIfElseEndif.fs (1,4--1,5)), None,
+                  Const (Int32 42, /root/SingleIfElseEndif.fs (5,4--5,6)),
+                  /root/SingleIfElseEndif.fs (1,4--1,5),
+                  Yes /root/SingleIfElseEndif.fs (1,0--5,6),
+                  { LeadingKeyword = Let /root/SingleIfElseEndif.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange = Some /root/SingleIfElseEndif.fs (1,6--1,7) })],
+              /root/SingleIfElseEndif.fs (1,0--5,6))], PreXmlDocEmpty, [], None,
+          /root/SingleIfElseEndif.fs (1,0--6,10), { LeadingKeyword = None })],
+      (true, false),
+      { ConditionalDirectives =
+         [If (Ident "DEBUG", /root/SingleIfElseEndif.fs (2,4--2,13));
+          Else /root/SingleIfElseEndif.fs (4,4--4,9);
+          EndIf /root/SingleIfElseEndif.fs (6,4--6,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi b/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi
new file mode 100644
index 00000000000..02acf6b0da2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi
@@ -0,0 +1,7 @@
+namespace Foobar
+
+val v: int =
+    #if DEBUG
+    1
+    #endif
+    42
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi.bsl
new file mode 100644
index 00000000000..b471be5885c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi.bsl
@@ -0,0 +1,31 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SingleIfEndif,SignatureFile.fsi",
+      QualifiedNameOfFile SingleIfEndif,SignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Foobar], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (v, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 Some
+                   (Const
+                      (Int32 42,
+                       /root/SingleIfEndif,SignatureFile.fsi (7,4--7,6))),
+                 /root/SingleIfEndif,SignatureFile.fsi (3,0--7,6),
+                 { LeadingKeyword =
+                    Val /root/SingleIfEndif,SignatureFile.fsi (3,0--3,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange =
+                    Some /root/SingleIfEndif,SignatureFile.fsi (3,11--3,12) }),
+              /root/SingleIfEndif,SignatureFile.fsi (3,0--7,6))], PreXmlDocEmpty,
+          [], None, /root/SingleIfEndif,SignatureFile.fsi (1,0--7,6),
+          { LeadingKeyword =
+             Namespace /root/SingleIfEndif,SignatureFile.fsi (1,0--1,9) })],
+      { ConditionalDirectives =
+         [If (Ident "DEBUG", /root/SingleIfEndif,SignatureFile.fsi (4,4--4,13));
+          EndIf /root/SingleIfEndif,SignatureFile.fsi (6,4--6,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfEndif.fs b/tests/service/data/SyntaxTree/SingleIfEndif.fs
new file mode 100644
index 00000000000..490cff03e02
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleIfEndif.fs
@@ -0,0 +1,5 @@
+let v =
+    #if DEBUG
+    ()
+    #endif
+    42
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfEndif.fs.bsl b/tests/service/data/SyntaxTree/SingleIfEndif.fs.bsl
new file mode 100644
index 00000000000..30981cadd3b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleIfEndif.fs.bsl
@@ -0,0 +1,28 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SingleIfEndif.fs", false, QualifiedNameOfFile SingleIfEndif, [], [],
+      [SynModuleOrNamespace
+         ([SingleIfEndif], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/SingleIfEndif.fs (1,4--1,5)), None,
+                  Const (Int32 42, /root/SingleIfEndif.fs (5,4--5,6)),
+                  /root/SingleIfEndif.fs (1,4--1,5),
+                  Yes /root/SingleIfEndif.fs (1,0--5,6),
+                  { LeadingKeyword = Let /root/SingleIfEndif.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange = Some /root/SingleIfEndif.fs (1,6--1,7) })],
+              /root/SingleIfEndif.fs (1,0--5,6))], PreXmlDocEmpty, [], None,
+          /root/SingleIfEndif.fs (1,0--5,6), { LeadingKeyword = None })],
+      (true, false),
+      { ConditionalDirectives =
+         [If (Ident "DEBUG", /root/SingleIfEndif.fs (2,4--2,13));
+          EndIf /root/SingleIfEndif.fs (4,4--4,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs b/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs
new file mode 100644
index 00000000000..b5070f540e4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs
@@ -0,0 +1 @@
+type Foo = One = 0x00000001
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl b/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
new file mode 100644
index 00000000000..a75d4046d35
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
@@ -0,0 +1,42 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SingleSynEnumCaseContainsRangeOfConstant.fs", false,
+      QualifiedNameOfFile SingleSynEnumCaseContainsRangeOfConstant, [], [],
+      [SynModuleOrNamespace
+         ([SingleSynEnumCaseContainsRangeOfConstant], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,5--1,8)),
+                  Simple
+                    (Enum
+                       ([SynEnumCase
+                           ([], SynIdent (One, None),
+                            Const
+                              (Int32 1,
+                               /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,17--1,27)),
+                            PreXmlDoc ((1,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,11--1,27),
+                            { BarRange = None
+                              EqualsRange =
+                               /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,15--1,16) })],
+                        /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,11--1,27)),
+                     /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,11--1,27)),
+                  [], None,
+                  /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,5--1,27),
+                  { LeadingKeyword =
+                     Type
+                       /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,0--1,27))],
+          PreXmlDocEmpty, [], None,
+          /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,0--1,27),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs b/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs
new file mode 100644
index 00000000000..0047eb6d33c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs
@@ -0,0 +1 @@
+type Foo = | Bar = 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs.bsl b/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs.bsl
new file mode 100644
index 00000000000..d5c255d05dd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs.bsl
@@ -0,0 +1,41 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SingleSynEnumCaseHasBarRange.fs", false,
+      QualifiedNameOfFile SingleSynEnumCaseHasBarRange, [], [],
+      [SynModuleOrNamespace
+         ([SingleSynEnumCaseHasBarRange], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SingleSynEnumCaseHasBarRange.fs (1,5--1,8)),
+                  Simple
+                    (Enum
+                       ([SynEnumCase
+                           ([], SynIdent (Bar, None),
+                            Const
+                              (Int32 1,
+                               /root/SingleSynEnumCaseHasBarRange.fs (1,19--1,20)),
+                            PreXmlDoc ((1,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SingleSynEnumCaseHasBarRange.fs (1,13--1,20),
+                            { BarRange =
+                               Some
+                                 /root/SingleSynEnumCaseHasBarRange.fs (1,11--1,12)
+                              EqualsRange =
+                               /root/SingleSynEnumCaseHasBarRange.fs (1,17--1,18) })],
+                        /root/SingleSynEnumCaseHasBarRange.fs (1,11--1,20)),
+                     /root/SingleSynEnumCaseHasBarRange.fs (1,11--1,20)), [],
+                  None, /root/SingleSynEnumCaseHasBarRange.fs (1,5--1,20),
+                  { LeadingKeyword =
+                     Type /root/SingleSynEnumCaseHasBarRange.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/SingleSynEnumCaseHasBarRange.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/SingleSynEnumCaseHasBarRange.fs (1,0--1,20))],
+          PreXmlDocEmpty, [], None,
+          /root/SingleSynEnumCaseHasBarRange.fs (1,0--1,20),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs b/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs
new file mode 100644
index 00000000000..2fee6037eac
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs
@@ -0,0 +1 @@
+type Foo = Bar = 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs.bsl b/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs.bsl
new file mode 100644
index 00000000000..2be912218ad
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs.bsl
@@ -0,0 +1,38 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SingleSynEnumCaseWithoutBar.fs", false,
+      QualifiedNameOfFile SingleSynEnumCaseWithoutBar, [], [],
+      [SynModuleOrNamespace
+         ([SingleSynEnumCaseWithoutBar], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SingleSynEnumCaseWithoutBar.fs (1,5--1,8)),
+                  Simple
+                    (Enum
+                       ([SynEnumCase
+                           ([], SynIdent (Bar, None),
+                            Const
+                              (Int32 1,
+                               /root/SingleSynEnumCaseWithoutBar.fs (1,17--1,18)),
+                            PreXmlDoc ((1,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SingleSynEnumCaseWithoutBar.fs (1,11--1,18),
+                            { BarRange = None
+                              EqualsRange =
+                               /root/SingleSynEnumCaseWithoutBar.fs (1,15--1,16) })],
+                        /root/SingleSynEnumCaseWithoutBar.fs (1,11--1,18)),
+                     /root/SingleSynEnumCaseWithoutBar.fs (1,11--1,18)), [],
+                  None, /root/SingleSynEnumCaseWithoutBar.fs (1,5--1,18),
+                  { LeadingKeyword =
+                     Type /root/SingleSynEnumCaseWithoutBar.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/SingleSynEnumCaseWithoutBar.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/SingleSynEnumCaseWithoutBar.fs (1,0--1,18))], PreXmlDocEmpty,
+          [], None, /root/SingleSynEnumCaseWithoutBar.fs (1,0--1,18),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs b/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs
new file mode 100644
index 00000000000..cad53954b25
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs
@@ -0,0 +1,3 @@
+type X =
+    static member inline replace< ^a, ^b, ^c when ^b: (static member replace: ^a * ^b -> ^c)>(a: ^a, f: ^b) =
+        (^b : (static member replace: ^a * ^b -> ^c) (a, f))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs.bsl
new file mode 100644
index 00000000000..86f1bcafbb5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs.bsl
@@ -0,0 +1,230 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SingleSynTypeInsideSynExprTraitCall.fs", false,
+      QualifiedNameOfFile SingleSynTypeInsideSynExprTraitCall, [], [],
+      [SynModuleOrNamespace
+         ([SingleSynTypeInsideSynExprTraitCall], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SingleSynTypeInsideSynExprTraitCall.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynBinding
+                           (None, Normal, true, false, [],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = false
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, Some a);
+                                    SynArgInfo ([], false, Some f)]],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent ([replace], [], [None]), None,
+                               Some
+                                 (SynValTyparDecls
+                                    (Some
+                                       (PostfixList
+                                          ([SynTyparDecl
+                                              ([], SynTypar (a, HeadType, false));
+                                            SynTyparDecl
+                                              ([], SynTypar (b, HeadType, false));
+                                            SynTyparDecl
+                                              ([], SynTypar (c, HeadType, false))],
+                                           [WhereTyparSupportsMember
+                                              (Var
+                                                 (SynTypar (b, HeadType, false),
+                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (2,50--2,52)),
+                                               Member
+                                                 (SynValSig
+                                                    ([],
+                                                     SynIdent (replace, None),
+                                                     SynValTyparDecls
+                                                       (None, true),
+                                                     Fun
+                                                       (Tuple
+                                                          (false,
+                                                           [Type
+                                                              (Var
+                                                                 (SynTypar
+                                                                    (a, HeadType,
+                                                                     false),
+                                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (2,78--2,80)));
+                                                            Star
+                                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (2,81--2,82);
+                                                            Type
+                                                              (Var
+                                                                 (SynTypar
+                                                                    (b, HeadType,
+                                                                     false),
+                                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (2,83--2,85)))],
+                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (2,78--2,85)),
+                                                        Var
+                                                          (SynTypar
+                                                             (c, HeadType, false),
+                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (2,89--2,91)),
+                                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (2,78--2,91),
+                                                        { ArrowRange =
+                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (2,86--2,88) }),
+                                                     SynValInfo
+                                                       ([[SynArgInfo
+                                                            ([], false, None);
+                                                          SynArgInfo
+                                                            ([], false, None)]],
+                                                        SynArgInfo
+                                                          ([], false, None)),
+                                                     false, false,
+                                                     PreXmlDoc ((2,55), FSharp.Compiler.Xml.XmlDocCollector),
+                                                     None, None,
+                                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (2,55--2,91),
+                                                     { LeadingKeyword =
+                                                        StaticMember
+                                                          (/root/SingleSynTypeInsideSynExprTraitCall.fs (2,55--2,61),
+                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (2,62--2,68))
+                                                       InlineKeyword = None
+                                                       WithKeyword = None
+                                                       EqualsRange = None }),
+                                                  { IsInstance = false
+                                                    IsDispatchSlot = false
+                                                    IsOverrideOrExplicitImpl =
+                                                     false
+                                                    IsFinal = false
+                                                    GetterOrSetterIsCompilerGenerated =
+                                                     false
+                                                    MemberKind = Member },
+                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (2,55--2,91),
+                                                  { GetSetKeywords = None }),
+                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (2,50--2,92))],
+                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (2,32--2,93))),
+                                     false)),
+                               Pats
+                                 [Paren
+                                    (Tuple
+                                       (false,
+                                        [Typed
+                                           (Named
+                                              (SynIdent (a, None), false, None,
+                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (2,94--2,95)),
+                                            Var
+                                              (SynTypar (a, HeadType, false),
+                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (2,97--2,99)),
+                                            /root/SingleSynTypeInsideSynExprTraitCall.fs (2,94--2,99));
+                                         Typed
+                                           (Named
+                                              (SynIdent (f, None), false, None,
+                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (2,101--2,102)),
+                                            Var
+                                              (SynTypar (b, HeadType, false),
+                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (2,104--2,106)),
+                                            /root/SingleSynTypeInsideSynExprTraitCall.fs (2,101--2,106))],
+                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (2,94--2,106)),
+                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (2,93--2,107))],
+                               None,
+                               /root/SingleSynTypeInsideSynExprTraitCall.fs (2,25--2,107)),
+                            None,
+                            Paren
+                              (TraitCall
+                                 (Var
+                                    (SynTypar (b, HeadType, false),
+                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,9--3,11)),
+                                  Member
+                                    (SynValSig
+                                       ([], SynIdent (replace, None),
+                                        SynValTyparDecls (None, true),
+                                        Fun
+                                          (Tuple
+                                             (false,
+                                              [Type
+                                                 (Var
+                                                    (SynTypar
+                                                       (a, HeadType, false),
+                                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,38--3,40)));
+                                               Star
+                                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (3,41--3,42);
+                                               Type
+                                                 (Var
+                                                    (SynTypar
+                                                       (b, HeadType, false),
+                                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,43--3,45)))],
+                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (3,38--3,45)),
+                                           Var
+                                             (SynTypar (c, HeadType, false),
+                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (3,49--3,51)),
+                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (3,38--3,51),
+                                           { ArrowRange =
+                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (3,46--3,48) }),
+                                        SynValInfo
+                                          ([[SynArgInfo ([], false, None);
+                                             SynArgInfo ([], false, None)]],
+                                           SynArgInfo ([], false, None)), false,
+                                        false,
+                                        PreXmlDoc ((3,15), FSharp.Compiler.Xml.XmlDocCollector),
+                                        None, None,
+                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (3,15--3,51),
+                                        { LeadingKeyword =
+                                           StaticMember
+                                             (/root/SingleSynTypeInsideSynExprTraitCall.fs (3,15--3,21),
+                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (3,22--3,28))
+                                          InlineKeyword = None
+                                          WithKeyword = None
+                                          EqualsRange = None }),
+                                     { IsInstance = false
+                                       IsDispatchSlot = false
+                                       IsOverrideOrExplicitImpl = false
+                                       IsFinal = false
+                                       GetterOrSetterIsCompilerGenerated = false
+                                       MemberKind = Member },
+                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,15--3,51),
+                                     { GetSetKeywords = None }),
+                                  Paren
+                                    (Tuple
+                                       (false, [Ident a; Ident f],
+                                        [/root/SingleSynTypeInsideSynExprTraitCall.fs (3,55--3,56)],
+                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (3,54--3,58)),
+                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,53--3,54),
+                                     Some
+                                       /root/SingleSynTypeInsideSynExprTraitCall.fs (3,58--3,59),
+                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,53--3,59)),
+                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (3,8--3,60)),
+                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,8--3,9),
+                               Some
+                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (3,59--3,60),
+                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,8--3,60)),
+                            /root/SingleSynTypeInsideSynExprTraitCall.fs (2,25--2,107),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               StaticMember
+                                 (/root/SingleSynTypeInsideSynExprTraitCall.fs (2,4--2,10),
+                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (2,11--2,17))
+                              InlineKeyword =
+                               Some
+                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (2,18--2,24)
+                              EqualsRange =
+                               Some
+                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (2,108--2,109) }),
+                         /root/SingleSynTypeInsideSynExprTraitCall.fs (2,4--3,60))],
+                     /root/SingleSynTypeInsideSynExprTraitCall.fs (2,4--3,60)),
+                  [], None,
+                  /root/SingleSynTypeInsideSynExprTraitCall.fs (1,5--3,60),
+                  { LeadingKeyword =
+                     Type
+                       /root/SingleSynTypeInsideSynExprTraitCall.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SingleSynTypeInsideSynExprTraitCall.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/SingleSynTypeInsideSynExprTraitCall.fs (1,0--3,60))],
+          PreXmlDocEmpty, [], None,
+          /root/SingleSynTypeInsideSynExprTraitCall.fs (1,0--3,60),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs b/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs
new file mode 100644
index 00000000000..55f8a3064d5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs
@@ -0,0 +1 @@
+type Foo = | Bar of string
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs.bsl b/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs.bsl
new file mode 100644
index 00000000000..42e21f7b550
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs.bsl
@@ -0,0 +1,47 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SingleSynUnionCaseHasBarRange.fs", false,
+      QualifiedNameOfFile SingleSynUnionCaseHasBarRange, [], [],
+      [SynModuleOrNamespace
+         ([SingleSynUnionCaseHasBarRange], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SingleSynUnionCaseHasBarRange.fs (1,5--1,8)),
+                  Simple
+                    (Union
+                       (None,
+                        [SynUnionCase
+                           ([], SynIdent (Bar, None),
+                            Fields
+                              [SynField
+                                 ([], false, None,
+                                  LongIdent
+                                    (SynLongIdent ([string], [], [None])), false,
+                                  PreXmlDoc ((1,20), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/SingleSynUnionCaseHasBarRange.fs (1,20--1,26),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((1,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/SingleSynUnionCaseHasBarRange.fs (1,13--1,26),
+                            { BarRange =
+                               Some
+                                 /root/SingleSynUnionCaseHasBarRange.fs (1,11--1,12) })],
+                        /root/SingleSynUnionCaseHasBarRange.fs (1,11--1,26)),
+                     /root/SingleSynUnionCaseHasBarRange.fs (1,11--1,26)), [],
+                  None, /root/SingleSynUnionCaseHasBarRange.fs (1,5--1,26),
+                  { LeadingKeyword =
+                     Type /root/SingleSynUnionCaseHasBarRange.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/SingleSynUnionCaseHasBarRange.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/SingleSynUnionCaseHasBarRange.fs (1,0--1,26))],
+          PreXmlDocEmpty, [], None,
+          /root/SingleSynUnionCaseHasBarRange.fs (1,0--1,26),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs b/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs
new file mode 100644
index 00000000000..0beec8a1a9c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs
@@ -0,0 +1 @@
+type Foo = Bar of string
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs.bsl b/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs.bsl
new file mode 100644
index 00000000000..6f494ba1ab0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs.bsl
@@ -0,0 +1,45 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SingleSynUnionCaseWithoutBar.fs", false,
+      QualifiedNameOfFile SingleSynUnionCaseWithoutBar, [], [],
+      [SynModuleOrNamespace
+         ([SingleSynUnionCaseWithoutBar], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SingleSynUnionCaseWithoutBar.fs (1,5--1,8)),
+                  Simple
+                    (Union
+                       (None,
+                        [SynUnionCase
+                           ([], SynIdent (Bar, None),
+                            Fields
+                              [SynField
+                                 ([], false, None,
+                                  LongIdent
+                                    (SynLongIdent ([string], [], [None])), false,
+                                  PreXmlDoc ((1,18), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/SingleSynUnionCaseWithoutBar.fs (1,18--1,24),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((1,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/SingleSynUnionCaseWithoutBar.fs (1,11--1,24),
+                            { BarRange = None })],
+                        /root/SingleSynUnionCaseWithoutBar.fs (1,11--1,24)),
+                     /root/SingleSynUnionCaseWithoutBar.fs (1,11--1,24)), [],
+                  None, /root/SingleSynUnionCaseWithoutBar.fs (1,5--1,24),
+                  { LeadingKeyword =
+                     Type /root/SingleSynUnionCaseWithoutBar.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/SingleSynUnionCaseWithoutBar.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/SingleSynUnionCaseWithoutBar.fs (1,0--1,24))],
+          PreXmlDocEmpty, [], None,
+          /root/SingleSynUnionCaseWithoutBar.fs (1,0--1,24),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs b/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs
new file mode 100644
index 00000000000..c2e4c619c80
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs
@@ -0,0 +1 @@
+#I __SOURCE_DIRECTORY__
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
new file mode 100644
index 00000000000..d83a067d86e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
@@ -0,0 +1,19 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SourceIdentifierAsParsedHashDirectiveArgument.fs", false,
+      QualifiedNameOfFile SourceIdentifierAsParsedHashDirectiveArgument, [], [],
+      [SynModuleOrNamespace
+         ([SourceIdentifierAsParsedHashDirectiveArgument], false, AnonModule,
+          [HashDirective
+             (ParsedHashDirective
+                ("I",
+                 [SourceIdentifier
+                    ("__SOURCE_DIRECTORY__", "C:\root",
+                     /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (1,3--1,23))],
+                 /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (1,0--1,23)),
+              /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (1,0--1,23))],
+          PreXmlDocEmpty, [], None,
+          /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (1,0--1,23),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs b/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs
new file mode 100644
index 00000000000..9f56cd3366e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    static abstract Y : int -> int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs.bsl
new file mode 100644
index 00000000000..0bd2e0183d2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs.bsl
@@ -0,0 +1,56 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/StaticAbstractKeyword.fs", false,
+      QualifiedNameOfFile StaticAbstractKeyword, [], [],
+      [SynModuleOrNamespace
+         ([StaticAbstractKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/StaticAbstractKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [AbstractSlot
+                        (SynValSig
+                           ([], SynIdent (Y, None),
+                            SynValTyparDecls (None, true),
+                            Fun
+                              (LongIdent (SynLongIdent ([int], [], [None])),
+                               LongIdent (SynLongIdent ([int], [], [None])),
+                               /root/StaticAbstractKeyword.fs (2,24--2,34),
+                               { ArrowRange =
+                                  /root/StaticAbstractKeyword.fs (2,28--2,30) }),
+                            SynValInfo
+                              ([[SynArgInfo ([], false, None)]],
+                               SynArgInfo ([], false, None)), false, false,
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/StaticAbstractKeyword.fs (2,4--2,34),
+                            { LeadingKeyword =
+                               StaticAbstract
+                                 (/root/StaticAbstractKeyword.fs (2,4--2,10),
+                                  /root/StaticAbstractKeyword.fs (2,11--2,19))
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = false
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = Member },
+                         /root/StaticAbstractKeyword.fs (2,4--2,34),
+                         { GetSetKeywords = None })],
+                     /root/StaticAbstractKeyword.fs (2,4--2,34)), [], None,
+                  /root/StaticAbstractKeyword.fs (1,5--2,34),
+                  { LeadingKeyword =
+                     Type /root/StaticAbstractKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/StaticAbstractKeyword.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/StaticAbstractKeyword.fs (1,0--2,34))], PreXmlDocEmpty, [],
+          None, /root/StaticAbstractKeyword.fs (1,0--2,34),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs b/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs
new file mode 100644
index 00000000000..8428cb9b5f7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    static abstract member Y : int -> int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs.bsl
new file mode 100644
index 00000000000..e649408227b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs.bsl
@@ -0,0 +1,59 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/StaticAbstractMemberKeyword.fs", false,
+      QualifiedNameOfFile StaticAbstractMemberKeyword, [], [],
+      [SynModuleOrNamespace
+         ([StaticAbstractMemberKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/StaticAbstractMemberKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [AbstractSlot
+                        (SynValSig
+                           ([], SynIdent (Y, None),
+                            SynValTyparDecls (None, true),
+                            Fun
+                              (LongIdent (SynLongIdent ([int], [], [None])),
+                               LongIdent (SynLongIdent ([int], [], [None])),
+                               /root/StaticAbstractMemberKeyword.fs (2,31--2,41),
+                               { ArrowRange =
+                                  /root/StaticAbstractMemberKeyword.fs (2,35--2,37) }),
+                            SynValInfo
+                              ([[SynArgInfo ([], false, None)]],
+                               SynArgInfo ([], false, None)), false, false,
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/StaticAbstractMemberKeyword.fs (2,4--2,41),
+                            { LeadingKeyword =
+                               StaticAbstractMember
+                                 (/root/StaticAbstractMemberKeyword.fs (2,4--2,10),
+                                  /root/StaticAbstractMemberKeyword.fs (2,11--2,19),
+                                  /root/StaticAbstractMemberKeyword.fs (2,20--2,26))
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = false
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = Member },
+                         /root/StaticAbstractMemberKeyword.fs (2,4--2,41),
+                         { GetSetKeywords = None })],
+                     /root/StaticAbstractMemberKeyword.fs (2,4--2,41)), [], None,
+                  /root/StaticAbstractMemberKeyword.fs (1,5--2,41),
+                  { LeadingKeyword =
+                     Type /root/StaticAbstractMemberKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/StaticAbstractMemberKeyword.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/StaticAbstractMemberKeyword.fs (1,0--2,41))], PreXmlDocEmpty,
+          [], None, /root/StaticAbstractMemberKeyword.fs (1,0--2,41),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticLetKeyword.fs b/tests/service/data/SyntaxTree/StaticLetKeyword.fs
new file mode 100644
index 00000000000..0f32265ec37
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticLetKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    static let PI = 3.14
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticLetKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticLetKeyword.fs.bsl
new file mode 100644
index 00000000000..12129e29fc3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticLetKeyword.fs.bsl
@@ -0,0 +1,48 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/StaticLetKeyword.fs", false, QualifiedNameOfFile StaticLetKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([StaticLetKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/StaticLetKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [LetBindings
+                        ([SynBinding
+                            (None, Normal, false, false, [],
+                             PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                             SynValData
+                               (None,
+                                SynValInfo ([], SynArgInfo ([], false, None)),
+                                None),
+                             LongIdent
+                               (SynLongIdent ([PI], [], [None]), None, None,
+                                Pats [], None,
+                                /root/StaticLetKeyword.fs (2,15--2,17)), None,
+                             Const
+                               (Double 3.14,
+                                /root/StaticLetKeyword.fs (2,20--2,24)),
+                             /root/StaticLetKeyword.fs (2,15--2,17),
+                             Yes /root/StaticLetKeyword.fs (2,11--2,24),
+                             { LeadingKeyword =
+                                StaticLet
+                                  (/root/StaticLetKeyword.fs (2,4--2,10),
+                                   /root/StaticLetKeyword.fs (2,11--2,14))
+                               InlineKeyword = None
+                               EqualsRange =
+                                Some /root/StaticLetKeyword.fs (2,18--2,19) })],
+                         true, false, /root/StaticLetKeyword.fs (2,4--2,24))],
+                     /root/StaticLetKeyword.fs (2,4--2,24)), [], None,
+                  /root/StaticLetKeyword.fs (1,5--2,24),
+                  { LeadingKeyword = Type /root/StaticLetKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/StaticLetKeyword.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/StaticLetKeyword.fs (1,0--2,24))], PreXmlDocEmpty, [], None,
+          /root/StaticLetKeyword.fs (1,0--2,24), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs b/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs
new file mode 100644
index 00000000000..dec32e2d3b2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    static let rec forever () = forever()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs.bsl
new file mode 100644
index 00000000000..42299a38387
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs.bsl
@@ -0,0 +1,60 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/StaticLetRecKeyword.fs", false,
+      QualifiedNameOfFile StaticLetRecKeyword, [], [],
+      [SynModuleOrNamespace
+         ([StaticLetRecKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/StaticLetRecKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [LetBindings
+                        ([SynBinding
+                            (None, Normal, false, false, [],
+                             PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                             SynValData
+                               (None,
+                                SynValInfo ([[]], SynArgInfo ([], false, None)),
+                                None),
+                             LongIdent
+                               (SynLongIdent ([forever], [], [None]), None, None,
+                                Pats
+                                  [Paren
+                                     (Const
+                                        (Unit,
+                                         /root/StaticLetRecKeyword.fs (2,27--2,29)),
+                                      /root/StaticLetRecKeyword.fs (2,27--2,29))],
+                                None, /root/StaticLetRecKeyword.fs (2,19--2,29)),
+                             None,
+                             App
+                               (Atomic, false, Ident forever,
+                                Const
+                                  (Unit,
+                                   /root/StaticLetRecKeyword.fs (2,39--2,41)),
+                                /root/StaticLetRecKeyword.fs (2,32--2,41)),
+                             /root/StaticLetRecKeyword.fs (2,19--2,29),
+                             NoneAtLet,
+                             { LeadingKeyword =
+                                StaticLetRec
+                                  (/root/StaticLetRecKeyword.fs (2,4--2,10),
+                                   /root/StaticLetRecKeyword.fs (2,11--2,14),
+                                   /root/StaticLetRecKeyword.fs (2,15--2,18))
+                               InlineKeyword = None
+                               EqualsRange =
+                                Some /root/StaticLetRecKeyword.fs (2,30--2,31) })],
+                         true, true, /root/StaticLetRecKeyword.fs (2,4--2,41))],
+                     /root/StaticLetRecKeyword.fs (2,4--2,41)), [], None,
+                  /root/StaticLetRecKeyword.fs (1,5--2,41),
+                  { LeadingKeyword =
+                     Type /root/StaticLetRecKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/StaticLetRecKeyword.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/StaticLetRecKeyword.fs (1,0--2,41))], PreXmlDocEmpty, [],
+          None, /root/StaticLetRecKeyword.fs (1,0--2,41),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticMemberKeyword.fs b/tests/service/data/SyntaxTree/StaticMemberKeyword.fs
new file mode 100644
index 00000000000..49e7d9cfd7d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticMemberKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    static member Y : int = 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticMemberKeyword.fs.bsl
new file mode 100644
index 00000000000..afa710dc3d4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticMemberKeyword.fs.bsl
@@ -0,0 +1,65 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/StaticMemberKeyword.fs", false,
+      QualifiedNameOfFile StaticMemberKeyword, [], [],
+      [SynModuleOrNamespace
+         ([StaticMemberKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/StaticMemberKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = false
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo ([[]], SynArgInfo ([], false, None)),
+                               None),
+                            LongIdent
+                              (SynLongIdent ([Y], [], [None]), None, None,
+                               Pats [], None,
+                               /root/StaticMemberKeyword.fs (2,18--2,19)),
+                            Some
+                              (SynBindingReturnInfo
+                                 (LongIdent (SynLongIdent ([int], [], [None])),
+                                  /root/StaticMemberKeyword.fs (2,22--2,25), [],
+                                  { ColonRange =
+                                     Some
+                                       /root/StaticMemberKeyword.fs (2,20--2,21) })),
+                            Typed
+                              (Const
+                                 (Int32 1,
+                                  /root/StaticMemberKeyword.fs (2,28--2,29)),
+                               LongIdent (SynLongIdent ([int], [], [None])),
+                               /root/StaticMemberKeyword.fs (2,28--2,29)),
+                            /root/StaticMemberKeyword.fs (2,18--2,19),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               StaticMember
+                                 (/root/StaticMemberKeyword.fs (2,4--2,10),
+                                  /root/StaticMemberKeyword.fs (2,11--2,17))
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some /root/StaticMemberKeyword.fs (2,26--2,27) }),
+                         /root/StaticMemberKeyword.fs (2,4--2,29))],
+                     /root/StaticMemberKeyword.fs (2,4--2,29)), [], None,
+                  /root/StaticMemberKeyword.fs (1,5--2,29),
+                  { LeadingKeyword =
+                     Type /root/StaticMemberKeyword.fs (1,0--1,4)
+                    EqualsRange = Some /root/StaticMemberKeyword.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/StaticMemberKeyword.fs (1,0--2,29))], PreXmlDocEmpty, [],
+          None, /root/StaticMemberKeyword.fs (1,0--2,29),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs b/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs
new file mode 100644
index 00000000000..3e8ae45a284
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs
@@ -0,0 +1,2 @@
+type X =
+    static member val Y : int = 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs.bsl
new file mode 100644
index 00000000000..8379f47211a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs.bsl
@@ -0,0 +1,56 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/StaticMemberValKeyword.fs", false,
+      QualifiedNameOfFile StaticMemberValKeyword, [], [],
+      [SynModuleOrNamespace
+         ([StaticMemberValKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/StaticMemberValKeyword.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [AutoProperty
+                        ([], true, Y,
+                         Some (LongIdent (SynLongIdent ([int], [], [None]))),
+                         Member, { IsInstance = false
+                                   IsDispatchSlot = false
+                                   IsOverrideOrExplicitImpl = false
+                                   IsFinal = false
+                                   GetterOrSetterIsCompilerGenerated = false
+                                   MemberKind = Member },
+                         { IsInstance = false
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertySet },
+                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None,
+                         Const
+                           (Int32 1,
+                            /root/StaticMemberValKeyword.fs (2,32--2,33)),
+                         /root/StaticMemberValKeyword.fs (2,4--2,33),
+                         { LeadingKeyword =
+                            StaticMemberVal
+                              (/root/StaticMemberValKeyword.fs (2,4--2,10),
+                               /root/StaticMemberValKeyword.fs (2,11--2,17),
+                               /root/StaticMemberValKeyword.fs (2,18--2,21))
+                           WithKeyword = None
+                           EqualsRange =
+                            Some /root/StaticMemberValKeyword.fs (2,30--2,31)
+                           GetSetKeywords = None })],
+                     /root/StaticMemberValKeyword.fs (2,4--2,33)), [], None,
+                  /root/StaticMemberValKeyword.fs (1,5--2,33),
+                  { LeadingKeyword =
+                     Type /root/StaticMemberValKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/StaticMemberValKeyword.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/StaticMemberValKeyword.fs (1,0--2,33))], PreXmlDocEmpty, [],
+          None, /root/StaticMemberValKeyword.fs (1,0--2,33),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticValKeyword.fsi b/tests/service/data/SyntaxTree/StaticValKeyword.fsi
new file mode 100644
index 00000000000..d43a501af5f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticValKeyword.fsi
@@ -0,0 +1,4 @@
+namespace Meh
+
+type X =
+    static val Y : int -> int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/StaticValKeyword.fsi.bsl
new file mode 100644
index 00000000000..dffbbab519c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/StaticValKeyword.fsi.bsl
@@ -0,0 +1,41 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/StaticValKeyword.fsi", QualifiedNameOfFile StaticValKeyword, [], [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/StaticValKeyword.fsi (3,5--3,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [ValField
+                        (SynField
+                           ([], true, Some Y,
+                            Fun
+                              (LongIdent (SynLongIdent ([int], [], [None])),
+                               LongIdent (SynLongIdent ([int], [], [None])),
+                               /root/StaticValKeyword.fsi (4,19--4,29),
+                               { ArrowRange =
+                                  /root/StaticValKeyword.fsi (4,23--4,25) }),
+                            false,
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, /root/StaticValKeyword.fsi (4,4--4,29),
+                            { LeadingKeyword =
+                               Some
+                                 (StaticVal
+                                    (/root/StaticValKeyword.fsi (4,4--4,10),
+                                     /root/StaticValKeyword.fsi (4,11--4,14))) }),
+                         /root/StaticValKeyword.fsi (4,4--4,29))],
+                     /root/StaticValKeyword.fsi (4,4--4,29)), [],
+                  /root/StaticValKeyword.fsi (3,5--4,29),
+                  { LeadingKeyword = Type /root/StaticValKeyword.fsi (3,0--3,4)
+                    EqualsRange = Some /root/StaticValKeyword.fsi (3,7--3,8)
+                    WithKeyword = None })],
+              /root/StaticValKeyword.fsi (3,0--4,29))], PreXmlDocEmpty, [], None,
+          /root/StaticValKeyword.fsi (1,0--4,29),
+          { LeadingKeyword = Namespace /root/StaticValKeyword.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs
new file mode 100644
index 00000000000..b203e364bce
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs
@@ -0,0 +1,2 @@
+match x with
+| X(Y  = y) -> y
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..81ee58afc64
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,47 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs", false,
+      QualifiedNameOfFile SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign], false,
+          AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (1,0--1,12),
+                 Ident x,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([X], [], [None]), None, None,
+                        NamePatPairs
+                          ([(Y,
+                             /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,7--2,8),
+                             Named
+                               (SynIdent (y, None), false, None,
+                                /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,9--2,10)))],
+                           /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,4--2,11),
+                           { ParenRange =
+                              /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,3--2,11) }),
+                        None,
+                        /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,2--2,11)),
+                     None, Ident y,
+                     /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,2--2,16),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,12--2,14)
+                       BarRange =
+                        Some
+                          /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--2,1) })],
+                 /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (1,0--2,16),
+                 { MatchKeyword =
+                    /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (1,0--1,5)
+                   WithKeyword =
+                    /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (1,8--1,12) }),
+              /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (1,0--2,16))],
+          PreXmlDocEmpty, [], None,
+          /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (1,0--2,16),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs
new file mode 100644
index 00000000000..4aecc5f0f32
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs
@@ -0,0 +1 @@
+let bytes = "yo"B
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs.bsl
new file mode 100644
index 00000000000..4e16cf7feb8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs.bsl
@@ -0,0 +1,38 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynConstBytesWithSynByteStringKindRegular.fs", false,
+      QualifiedNameOfFile SynConstBytesWithSynByteStringKindRegular, [], [],
+      [SynModuleOrNamespace
+         ([SynConstBytesWithSynByteStringKindRegular], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (bytes, None), false, None,
+                     /root/SynConstBytesWithSynByteStringKindRegular.fs (1,4--1,9)),
+                  None,
+                  Const
+                    (Bytes
+                       ([|121uy; 111uy|], Regular,
+                        /root/SynConstBytesWithSynByteStringKindRegular.fs (1,12--1,17)),
+                     /root/SynConstBytesWithSynByteStringKindRegular.fs (1,12--1,17)),
+                  /root/SynConstBytesWithSynByteStringKindRegular.fs (1,4--1,9),
+                  Yes
+                    /root/SynConstBytesWithSynByteStringKindRegular.fs (1,0--1,17),
+                  { LeadingKeyword =
+                     Let
+                       /root/SynConstBytesWithSynByteStringKindRegular.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/SynConstBytesWithSynByteStringKindRegular.fs (1,10--1,11) })],
+              /root/SynConstBytesWithSynByteStringKindRegular.fs (1,0--1,17))],
+          PreXmlDocEmpty, [], None,
+          /root/SynConstBytesWithSynByteStringKindRegular.fs (1,0--1,17),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs
new file mode 100644
index 00000000000..1a5eb43eb60
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs
@@ -0,0 +1 @@
+let bytes = @"yo"B
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
new file mode 100644
index 00000000000..dbebd903a54
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
@@ -0,0 +1,38 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynConstBytesWithSynByteStringKindVerbatim.fs", false,
+      QualifiedNameOfFile SynConstBytesWithSynByteStringKindVerbatim, [], [],
+      [SynModuleOrNamespace
+         ([SynConstBytesWithSynByteStringKindVerbatim], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (bytes, None), false, None,
+                     /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,4--1,9)),
+                  None,
+                  Const
+                    (Bytes
+                       ([|121uy; 111uy|], Verbatim,
+                        /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,12--1,18)),
+                     /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,12--1,18)),
+                  /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,4--1,9),
+                  Yes
+                    /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,0--1,18),
+                  { LeadingKeyword =
+                     Let
+                       /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,10--1,11) })],
+              /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,0--1,18))],
+          PreXmlDocEmpty, [], None,
+          /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,0--1,18),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs
new file mode 100644
index 00000000000..bbcc8ae0ed0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs
@@ -0,0 +1 @@
+let s = "yo"
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs.bsl
new file mode 100644
index 00000000000..e4d51148aca
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs.bsl
@@ -0,0 +1,38 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynConstStringWithSynStringKindRegular.fs", false,
+      QualifiedNameOfFile SynConstStringWithSynStringKindRegular, [], [],
+      [SynModuleOrNamespace
+         ([SynConstStringWithSynStringKindRegular], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (s, None), false, None,
+                     /root/SynConstStringWithSynStringKindRegular.fs (1,4--1,5)),
+                  None,
+                  Const
+                    (String
+                       ("yo", Regular,
+                        /root/SynConstStringWithSynStringKindRegular.fs (1,8--1,12)),
+                     /root/SynConstStringWithSynStringKindRegular.fs (1,8--1,12)),
+                  /root/SynConstStringWithSynStringKindRegular.fs (1,4--1,5),
+                  Yes
+                    /root/SynConstStringWithSynStringKindRegular.fs (1,0--1,12),
+                  { LeadingKeyword =
+                     Let
+                       /root/SynConstStringWithSynStringKindRegular.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/SynConstStringWithSynStringKindRegular.fs (1,6--1,7) })],
+              /root/SynConstStringWithSynStringKindRegular.fs (1,0--1,12))],
+          PreXmlDocEmpty, [], None,
+          /root/SynConstStringWithSynStringKindRegular.fs (1,0--1,12),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs
new file mode 100644
index 00000000000..cb24facf13d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs
@@ -0,0 +1 @@
+let s = \"\"\"yo\"\"\"
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs.bsl
new file mode 100644
index 00000000000..32c20b474a1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs.bsl
@@ -0,0 +1,36 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynConstStringWithSynStringKindTripleQuote.fs", false,
+      QualifiedNameOfFile SynConstStringWithSynStringKindTripleQuote, [], [],
+      [SynModuleOrNamespace
+         ([SynConstStringWithSynStringKindTripleQuote], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (s, None), false, None,
+                     /root/SynConstStringWithSynStringKindTripleQuote.fs (1,4--1,5)),
+                  None,
+                  ArbitraryAfterError
+                    ("localBinding1",
+                     /root/SynConstStringWithSynStringKindTripleQuote.fs (1,7--1,7)),
+                  /root/SynConstStringWithSynStringKindTripleQuote.fs (1,4--1,5),
+                  Yes
+                    /root/SynConstStringWithSynStringKindTripleQuote.fs (1,4--1,7),
+                  { LeadingKeyword =
+                     Let
+                       /root/SynConstStringWithSynStringKindTripleQuote.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/SynConstStringWithSynStringKindTripleQuote.fs (1,6--1,7) })],
+              /root/SynConstStringWithSynStringKindTripleQuote.fs (1,0--1,7))],
+          PreXmlDocEmpty, [], None,
+          /root/SynConstStringWithSynStringKindTripleQuote.fs (1,0--1,22),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs
new file mode 100644
index 00000000000..be1d91d0109
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs
@@ -0,0 +1 @@
+let s = @"yo"
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs.bsl
new file mode 100644
index 00000000000..1d14f8f70a6
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs.bsl
@@ -0,0 +1,38 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynConstStringWithSynStringKindVerbatim.fs", false,
+      QualifiedNameOfFile SynConstStringWithSynStringKindVerbatim, [], [],
+      [SynModuleOrNamespace
+         ([SynConstStringWithSynStringKindVerbatim], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (s, None), false, None,
+                     /root/SynConstStringWithSynStringKindVerbatim.fs (1,4--1,5)),
+                  None,
+                  Const
+                    (String
+                       ("yo", Verbatim,
+                        /root/SynConstStringWithSynStringKindVerbatim.fs (1,8--1,13)),
+                     /root/SynConstStringWithSynStringKindVerbatim.fs (1,8--1,13)),
+                  /root/SynConstStringWithSynStringKindVerbatim.fs (1,4--1,5),
+                  Yes
+                    /root/SynConstStringWithSynStringKindVerbatim.fs (1,0--1,13),
+                  { LeadingKeyword =
+                     Let
+                       /root/SynConstStringWithSynStringKindVerbatim.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/SynConstStringWithSynStringKindVerbatim.fs (1,6--1,7) })],
+              /root/SynConstStringWithSynStringKindVerbatim.fs (1,0--1,13))],
+          PreXmlDocEmpty, [], None,
+          /root/SynConstStringWithSynStringKindVerbatim.fs (1,0--1,13),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs
new file mode 100644
index 00000000000..9274a5c8024
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs
@@ -0,0 +1,4 @@
+namespace X
+
+exception Foo with
+    member Meh () = ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
new file mode 100644
index 00000000000..4cd7aaad7f0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -0,0 +1,66 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs", false,
+      QualifiedNameOfFile SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([X], false, DeclaredNamespace,
+          [Exception
+             (SynExceptionDefn
+                (SynExceptionDefnRepr
+                   ([],
+                    SynUnionCase
+                      ([], SynIdent (Foo, None), Fields [], PreXmlDocEmpty, None,
+                       /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (3,10--3,13),
+                       { BarRange = None }), None,
+                    PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                    /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (3,0--3,13)),
+                 Some
+                   /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (3,14--3,18),
+                 [Member
+                    (SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (Some { IsInstance = true
+                                  IsDispatchSlot = false
+                                  IsOverrideOrExplicitImpl = false
+                                  IsFinal = false
+                                  GetterOrSetterIsCompilerGenerated = false
+                                  MemberKind = Member },
+                           SynValInfo
+                             ([[SynArgInfo ([], false, None)]; []],
+                              SynArgInfo ([], false, None)), None),
+                        LongIdent
+                          (SynLongIdent ([Meh], [], [None]), None, None,
+                           Pats
+                             [Paren
+                                (Const
+                                   (Unit,
+                                    /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,15--4,17)),
+                                 /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,15--4,17))],
+                           None,
+                           /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,11--4,17)),
+                        None,
+                        Const
+                          (Unit,
+                           /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,20--4,22)),
+                        /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,11--4,17),
+                        NoneAtInvisible,
+                        { LeadingKeyword =
+                           Member
+                             /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,18--4,19) }),
+                     /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,4--4,22))],
+                 /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (3,0--4,22)),
+              /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (3,0--4,22))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (1,0--4,22),
+          { LeadingKeyword =
+             Namespace
+               /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (1,0--1,9) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi b/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi
new file mode 100644
index 00000000000..5e385d118a9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi
@@ -0,0 +1,4 @@
+namespace X
+
+exception Foo with
+member Meh : unit -> unit
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
new file mode 100644
index 00000000000..bffb560ae94
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
@@ -0,0 +1,57 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi",
+      QualifiedNameOfFile SynExceptionSigShouldContainsTheRangeOfTheWithKeyword,
+      [], [],
+      [SynModuleOrNamespaceSig
+         ([X], false, DeclaredNamespace,
+          [Exception
+             (SynExceptionSig
+                (SynExceptionDefnRepr
+                   ([],
+                    SynUnionCase
+                      ([], SynIdent (Foo, None), Fields [], PreXmlDocEmpty, None,
+                       /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,10--3,13),
+                       { BarRange = None }), None,
+                    PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                    /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--3,13)),
+                 Some
+                   /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,14--3,18),
+                 [Member
+                    (SynValSig
+                       ([], SynIdent (Meh, None), SynValTyparDecls (None, true),
+                        Fun
+                          (LongIdent (SynLongIdent ([unit], [], [None])),
+                           LongIdent (SynLongIdent ([unit], [], [None])),
+                           /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,13--4,25),
+                           { ArrowRange =
+                              /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,18--4,20) }),
+                        SynValInfo
+                          ([[SynArgInfo ([], false, None)]],
+                           SynArgInfo ([], false, None)), false, false,
+                        PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                        None, None,
+                        /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,25),
+                        { LeadingKeyword =
+                           Member
+                             /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,6)
+                          InlineKeyword = None
+                          WithKeyword = None
+                          EqualsRange = None }),
+                     { IsInstance = true
+                       IsDispatchSlot = false
+                       IsOverrideOrExplicitImpl = false
+                       IsFinal = false
+                       GetterOrSetterIsCompilerGenerated = false
+                       MemberKind = Member },
+                     /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,25),
+                     { GetSetKeywords = None })],
+                 /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--4,25)),
+              /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--4,25))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (1,0--4,25),
+          { LeadingKeyword =
+             Namespace
+               /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs b/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs
new file mode 100644
index 00000000000..a9d565bd3b8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs
@@ -0,0 +1,7 @@
+async {
+    let! bar = getBar ()
+
+    and! foo = getFoo ()
+
+    return bar
+}
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs.bsl
new file mode 100644
index 00000000000..562dd8d3c26
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs.bsl
@@ -0,0 +1,58 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs", false,
+      QualifiedNameOfFile SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression], false,
+          AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false, Ident async,
+                 ComputationExpr
+                   (false,
+                    LetOrUseBang
+                      (Yes
+                         /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,4--2,24),
+                       false, true,
+                       Named
+                         (SynIdent (bar, None), false, None,
+                          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,9--2,12)),
+                       App
+                         (NonAtomic, false, Ident getBar,
+                          Const
+                            (Unit,
+                             /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,22--2,24)),
+                          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,15--2,24)),
+                       [SynExprAndBang
+                          (Yes
+                             /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (4,4--6,10),
+                           false, true,
+                           Named
+                             (SynIdent (foo, None), false, None,
+                              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (4,9--4,12)),
+                           App
+                             (NonAtomic, false, Ident getFoo,
+                              Const
+                                (Unit,
+                                 /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (4,22--4,24)),
+                              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (4,15--4,24)),
+                           /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (4,4--4,24),
+                           { EqualsRange =
+                              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (4,13--4,14)
+                             InKeyword = None })],
+                       YieldOrReturn
+                         ((false, true), Ident bar,
+                          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (6,4--6,14)),
+                       /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,4--6,14),
+                       { EqualsRange =
+                          Some
+                            /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,13--2,14) }),
+                    /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (1,6--7,1)),
+                 /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (1,0--7,1)),
+              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (1,0--7,1))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (1,0--7,1),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs b/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs
new file mode 100644
index 00000000000..a25bb24ced5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs
@@ -0,0 +1,6 @@
+struct 
+    {| Foo =
+    //  meh
+    someValue |}
+
+struct {| |}
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs.bsl
new file mode 100644
index 00000000000..50c1d706953
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs.bsl
@@ -0,0 +1,26 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprAnonRecdWithStructKeyword.fs", false,
+      QualifiedNameOfFile SynExprAnonRecdWithStructKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynExprAnonRecdWithStructKeyword], false, AnonModule,
+          [Expr
+             (AnonRecd
+                (true, None,
+                 [(Foo,
+                   Some /root/SynExprAnonRecdWithStructKeyword.fs (2,11--2,12),
+                   Ident someValue)],
+                 /root/SynExprAnonRecdWithStructKeyword.fs (1,0--4,16)),
+              /root/SynExprAnonRecdWithStructKeyword.fs (1,0--4,16));
+           Expr
+             (AnonRecd
+                (true, None, [],
+                 /root/SynExprAnonRecdWithStructKeyword.fs (6,0--6,12)),
+              /root/SynExprAnonRecdWithStructKeyword.fs (6,0--6,12))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprAnonRecdWithStructKeyword.fs (1,0--6,12),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/SynExprAnonRecdWithStructKeyword.fs (3,4--3,11)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs b/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs
new file mode 100644
index 00000000000..a4e6a06508e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs
@@ -0,0 +1,3 @@
+{| X = 5
+   Y    = 6
+   Z        = 7 |}
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl b/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
new file mode 100644
index 00000000000..325c8f96d51
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
@@ -0,0 +1,37 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs",
+      false,
+      QualifiedNameOfFile
+        SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields, [], [],
+      [SynModuleOrNamespace
+         ([SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields], false,
+          AnonModule,
+          [Expr
+             (AnonRecd
+                (false, None,
+                 [(X,
+                   Some
+                     /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (1,5--1,6),
+                   Const
+                     (Int32 5,
+                      /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (1,7--1,8)));
+                  (Y,
+                   Some
+                     /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,8--2,9),
+                   Const
+                     (Int32 6,
+                      /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,10--2,11)));
+                  (Z,
+                   Some
+                     /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (3,12--3,13),
+                   Const
+                     (Int32 7,
+                      /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (3,14--3,15)))],
+                 /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (1,0--3,18)),
+              /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (1,0--3,18))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (1,0--3,18),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs b/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs
new file mode 100644
index 00000000000..f252d0dcb07
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs
@@ -0,0 +1,5 @@
+let a =
+    do
+        foobar
+    do!
+        foobarBang
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
new file mode 100644
index 00000000000..80ccc811057
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
@@ -0,0 +1,41 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprDoContainsTheRangeOfTheDoKeyword.fs", false,
+      QualifiedNameOfFile SynExprDoContainsTheRangeOfTheDoKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynExprDoContainsTheRangeOfTheDoKeyword], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (a, None), false, None,
+                     /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (1,4--1,5)),
+                  None,
+                  Sequential
+                    (SuppressNeither, true,
+                     Do
+                       (Ident foobar,
+                        /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,4--3,14)),
+                     DoBang
+                       (Ident foobarBang,
+                        /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (4,4--5,18)),
+                     /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,4--5,18)),
+                  /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (1,4--1,5),
+                  NoneAtLet,
+                  { LeadingKeyword =
+                     Let
+                       /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (1,6--1,7) })],
+              /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (1,0--5,18))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (1,0--5,18),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs
new file mode 100644
index 00000000000..1e8eb27d4f8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs
@@ -0,0 +1 @@
+x?k
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs.bsl b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs.bsl
new file mode 100644
index 00000000000..df08e4e4104
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs.bsl
@@ -0,0 +1,16 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprDynamicDoesContainIdent.fs", false,
+      QualifiedNameOfFile SynExprDynamicDoesContainIdent, [], [],
+      [SynModuleOrNamespace
+         ([SynExprDynamicDoesContainIdent], false, AnonModule,
+          [Expr
+             (Dynamic
+                (Ident x, /root/SynExprDynamicDoesContainIdent.fs (1,1--1,2),
+                 Ident k, /root/SynExprDynamicDoesContainIdent.fs (1,0--1,3)),
+              /root/SynExprDynamicDoesContainIdent.fs (1,0--1,3))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprDynamicDoesContainIdent.fs (1,0--1,3),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs
new file mode 100644
index 00000000000..a11c285255d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs
@@ -0,0 +1 @@
+x?(g)
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs.bsl b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs.bsl
new file mode 100644
index 00000000000..4562f3166d7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs.bsl
@@ -0,0 +1,23 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprDynamicDoesContainParentheses.fs", false,
+      QualifiedNameOfFile SynExprDynamicDoesContainParentheses, [], [],
+      [SynModuleOrNamespace
+         ([SynExprDynamicDoesContainParentheses], false, AnonModule,
+          [Expr
+             (Dynamic
+                (Ident x,
+                 /root/SynExprDynamicDoesContainParentheses.fs (1,1--1,2),
+                 Paren
+                   (Ident g,
+                    /root/SynExprDynamicDoesContainParentheses.fs (1,2--1,3),
+                    Some
+                      /root/SynExprDynamicDoesContainParentheses.fs (1,4--1,5),
+                    /root/SynExprDynamicDoesContainParentheses.fs (1,2--1,5)),
+                 /root/SynExprDynamicDoesContainParentheses.fs (1,0--1,5)),
+              /root/SynExprDynamicDoesContainParentheses.fs (1,0--1,5))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprDynamicDoesContainParentheses.fs (1,0--1,5),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs
new file mode 100644
index 00000000000..b14d34d6ca7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs
@@ -0,0 +1,2 @@
+for i = 1 to 10 do
+printf "%d " i
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..111a42d7410
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,41 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprForContainsTheRangeOfTheEqualsSign.fs", false,
+      QualifiedNameOfFile SynExprForContainsTheRangeOfTheEqualsSign, [], [],
+      [SynModuleOrNamespace
+         ([SynExprForContainsTheRangeOfTheEqualsSign], false, AnonModule,
+          [Expr
+             (For
+                (Yes
+                   /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,0--1,3),
+                 Yes
+                   /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,10--1,12),
+                 i,
+                 Some
+                   /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,6--1,7),
+                 Const
+                   (Int32 1,
+                    /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,8--1,9)),
+                 true,
+                 Const
+                   (Int32 10,
+                    /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,13--1,15)),
+                 App
+                   (NonAtomic, false,
+                    App
+                      (NonAtomic, false, Ident printf,
+                       Const
+                         (String
+                            ("%d ", Regular,
+                             /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,7--2,12)),
+                          /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,7--2,12)),
+                       /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--2,12)),
+                    Ident i,
+                    /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--2,14)),
+                 /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,0--2,14)),
+              /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,0--2,14))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,0--2,14),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs
new file mode 100644
index 00000000000..3c0cf12c442
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs
@@ -0,0 +1 @@
+let s = $"yo {42}"
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
new file mode 100644
index 00000000000..74881026db4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
@@ -0,0 +1,48 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprInterpolatedStringWithSynStringKindRegular.fs", false,
+      QualifiedNameOfFile SynExprInterpolatedStringWithSynStringKindRegular, [],
+      [],
+      [SynModuleOrNamespace
+         ([SynExprInterpolatedStringWithSynStringKindRegular], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (s, None), false, None,
+                     /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,4--1,5)),
+                  None,
+                  InterpolatedString
+                    ([String
+                        ("yo ",
+                         /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,8--1,14));
+                      FillExpr
+                        (Const
+                           (Int32 42,
+                            /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,14--1,16)),
+                         None);
+                      String
+                        ("",
+                         /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,16--1,18))],
+                     Regular,
+                     /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,8--1,18)),
+                  /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,4--1,5),
+                  Yes
+                    /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,0--1,18),
+                  { LeadingKeyword =
+                     Let
+                       /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,6--1,7) })],
+              /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,0--1,18))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,0--1,18),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs
new file mode 100644
index 00000000000..d344c422673
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs
@@ -0,0 +1 @@
+let s = $\"\"\"yo {42}\"\"\"
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
new file mode 100644
index 00000000000..94cb7b1272d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
@@ -0,0 +1,38 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs", false,
+      QualifiedNameOfFile SynExprInterpolatedStringWithSynStringKindTripleQuote,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynExprInterpolatedStringWithSynStringKindTripleQuote], false,
+          AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (s, None), false, None,
+                     /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,4--1,5)),
+                  None,
+                  ArbitraryAfterError
+                    ("localBinding1",
+                     /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,7--1,7)),
+                  /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,4--1,5),
+                  Yes
+                    /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,4--1,7),
+                  { LeadingKeyword =
+                     Let
+                       /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,6--1,7) })],
+              /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,0--1,7))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,0--1,28),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs
new file mode 100644
index 00000000000..d0152142b4b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs
@@ -0,0 +1 @@
+let s = $@"Migrate notes of file ""{oldId}"" to new file ""{newId}""."
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
new file mode 100644
index 00000000000..62b50d5e3da
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
@@ -0,0 +1,49 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs", false,
+      QualifiedNameOfFile SynExprInterpolatedStringWithSynStringKindVerbatim, [],
+      [],
+      [SynModuleOrNamespace
+         ([SynExprInterpolatedStringWithSynStringKindVerbatim], false,
+          AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (s, None), false, None,
+                     /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,4--1,5)),
+                  None,
+                  InterpolatedString
+                    ([String
+                        ("Migrate notes of file "",
+                         /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,8--1,36));
+                      FillExpr (Ident oldId, None);
+                      String
+                        ("" to new file "",
+                         /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,41--1,60));
+                      FillExpr (Ident newId, None);
+                      String
+                        ("".",
+                         /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,65--1,70))],
+                     Verbatim,
+                     /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,8--1,70)),
+                  /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,4--1,5),
+                  Yes
+                    /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,0--1,70),
+                  { LeadingKeyword =
+                     Let
+                       /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,6--1,7) })],
+              /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,0--1,70))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,0--1,70),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs
new file mode 100644
index 00000000000..6020222bf88
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs
@@ -0,0 +1,5 @@
+comp {
+    let! x = y
+    and! z = someFunction ()
+    return ()
+}
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..746f1850676
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,56 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs", false,
+      QualifiedNameOfFile SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign, [],
+      [],
+      [SynModuleOrNamespace
+         ([SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign], false,
+          AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false, Ident comp,
+                 ComputationExpr
+                   (false,
+                    LetOrUseBang
+                      (Yes
+                         /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,4--2,14),
+                       false, true,
+                       Named
+                         (SynIdent (x, None), false, None,
+                          /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,9--2,10)),
+                       Ident y,
+                       [SynExprAndBang
+                          (Yes
+                             /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,4--4,10),
+                           false, true,
+                           Named
+                             (SynIdent (z, None), false, None,
+                              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,9--3,10)),
+                           App
+                             (NonAtomic, false, Ident someFunction,
+                              Const
+                                (Unit,
+                                 /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,26--3,28)),
+                              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,13--3,28)),
+                           /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,4--3,28),
+                           { EqualsRange =
+                              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,11--3,12)
+                             InKeyword = None })],
+                       YieldOrReturn
+                         ((false, true),
+                          Const
+                            (Unit,
+                             /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,11--4,13)),
+                          /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,4--4,13)),
+                       /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,4--4,13),
+                       { EqualsRange =
+                          Some
+                            /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,11--2,12) }),
+                    /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (1,5--5,1)),
+                 /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (1,0--5,1)),
+              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (1,0--5,1))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (1,0--5,1),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs
new file mode 100644
index 00000000000..38bbedb4457
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs
@@ -0,0 +1 @@
+let x = 1 in ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
new file mode 100644
index 00000000000..20a1cbc176d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
@@ -0,0 +1,45 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs", false,
+      QualifiedNameOfFile SynExprLetOrUseContainsTheRangeOfInKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynExprLetOrUseContainsTheRangeOfInKeyword], false, AnonModule,
+          [Expr
+             (LetOrUse
+                (false, false,
+                 [SynBinding
+                    (None, Normal, false, false, [],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     SynValData
+                       (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                        None),
+                     Named
+                       (SynIdent (x, None), false, None,
+                        /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,4--1,5)),
+                     None,
+                     Const
+                       (Int32 1,
+                        /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,8--1,9)),
+                     /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,4--1,5),
+                     Yes
+                       /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--1,9),
+                     { LeadingKeyword =
+                        Let
+                          /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--1,3)
+                       InlineKeyword = None
+                       EqualsRange =
+                        Some
+                          /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,6--1,7) })],
+                 Const
+                   (Unit,
+                    /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,13--1,15)),
+                 /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--1,15),
+                 { InKeyword =
+                    Some
+                      /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,10--1,12) }),
+              /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--1,15))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--1,15),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs
new file mode 100644
index 00000000000..f5000dff440
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs
@@ -0,0 +1,3 @@
+do
+let x = 1     
+()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
new file mode 100644
index 00000000000..be58428cc59
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
@@ -0,0 +1,46 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs", false,
+      QualifiedNameOfFile SynExprLetOrUseDoesNotContainTheRangeOfInKeyword, [],
+      [],
+      [SynModuleOrNamespace
+         ([SynExprLetOrUseDoesNotContainTheRangeOfInKeyword], false, AnonModule,
+          [Expr
+             (Do
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (x, None), false, None,
+                           /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,4--2,5)),
+                        None,
+                        Const
+                          (Int32 1,
+                           /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,8--2,9)),
+                        /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,4--2,5),
+                        Yes
+                          /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--2,9),
+                        { LeadingKeyword =
+                           Let
+                             /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--2,3)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,6--2,7) })],
+                    Const
+                      (Unit,
+                       /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,0--3,2)),
+                    /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--3,2),
+                    { InKeyword = None }),
+                 /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (1,0--3,2)),
+              /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (1,0--3,2))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (1,0--3,2),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs
new file mode 100644
index 00000000000..e547f75fa13
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs
@@ -0,0 +1,3 @@
+do
+let e1 = e :?> Collections.DictionaryEntry
+e1.Key, e1.Value
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
new file mode 100644
index 00000000000..c1783e22389
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
@@ -0,0 +1,69 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword],
+          false, AnonModule,
+          [Expr
+             (Do
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (e1, None), false, None,
+                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,4--2,6)),
+                        None,
+                        Downcast
+                          (Ident e,
+                           LongIdent
+                             (SynLongIdent
+                                ([Collections; DictionaryEntry],
+                                 [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,26--2,27)],
+                                 [None; None])),
+                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,9--2,42)),
+                        /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,4--2,6),
+                        Yes
+                          /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--2,42),
+                        { LeadingKeyword =
+                           Let
+                             /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--2,3)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,7--2,8) })],
+                    Tuple
+                      (false,
+                       [LongIdent
+                          (false,
+                           SynLongIdent
+                             ([e1; Key],
+                              [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,2--3,3)],
+                              [None; None]), None,
+                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,0--3,6));
+                        LongIdent
+                          (false,
+                           SynLongIdent
+                             ([e1; Value],
+                              [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,10--3,11)],
+                              [None; None]), None,
+                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,8--3,16))],
+                       [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,6--3,7)],
+                       /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,0--3,16)),
+                    /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--3,16),
+                    { InKeyword = None }),
+                 /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (1,0--3,16)),
+              /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (1,0--3,16))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (1,0--3,16),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs
new file mode 100644
index 00000000000..31234040154
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs
@@ -0,0 +1,4 @@
+do
+    let rec f = ()
+    and g = () in
+    ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
new file mode 100644
index 00000000000..303381cc53f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
@@ -0,0 +1,74 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword],
+          false, AnonModule,
+          [Expr
+             (Do
+                (LetOrUse
+                   (true, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (f, None), false, None,
+                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,12--2,13)),
+                        None,
+                        Const
+                          (Unit,
+                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,16--2,18)),
+                        /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,12--2,13),
+                        Yes
+                          /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,4--2,18),
+                        { LeadingKeyword =
+                           LetRec
+                             (/root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,4--2,7),
+                              /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,8--2,11))
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,14--2,15) });
+                     SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((3,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (g, None), false, None,
+                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,8--3,9)),
+                        None,
+                        Const
+                          (Unit,
+                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,12--3,14)),
+                        /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,8--3,9),
+                        Yes
+                          /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,4--3,14),
+                        { LeadingKeyword =
+                           And
+                             /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,4--3,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,10--3,11) })],
+                    Const
+                      (Unit,
+                       /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,4--4,6)),
+                    /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,4--4,6),
+                    { InKeyword =
+                       Some
+                         /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,15--3,17) }),
+                 /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (1,0--4,6)),
+              /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (1,0--4,6))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (1,0--4,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs b/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs
new file mode 100644
index 00000000000..8e56ad251b2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs
@@ -0,0 +1,2 @@
+match! x with
+| y -> z
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
new file mode 100644
index 00000000000..06d2a5885ce
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
@@ -0,0 +1,37 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs", false,
+      QualifiedNameOfFile
+        SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword], false,
+          AnonModule,
+          [Expr
+             (MatchBang
+                (Yes
+                   /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--1,13),
+                 Ident x,
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (y, None), false, None,
+                        /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,2--2,3)),
+                     None, Ident z,
+                     /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,2--2,8),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,4--2,6)
+                       BarRange =
+                        Some
+                          /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,1) })],
+                 /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--2,8),
+                 { MatchBangKeyword =
+                    /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--1,6)
+                   WithKeyword =
+                    /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (1,9--1,13) }),
+              /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--2,8))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--2,8),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs b/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs
new file mode 100644
index 00000000000..44b48ba9697
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs
@@ -0,0 +1,2 @@
+match x with
+| y -> z
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
new file mode 100644
index 00000000000..99dd0603bb8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
@@ -0,0 +1,37 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs", false,
+      QualifiedNameOfFile SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword], false,
+          AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--1,12),
+                 Ident x,
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (y, None), false, None,
+                        /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,2--2,3)),
+                     None, Ident z,
+                     /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,2--2,8),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,4--2,6)
+                       BarRange =
+                        Some
+                          /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,1) })],
+                 /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--2,8),
+                 { MatchKeyword =
+                    /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--1,5)
+                   WithKeyword =
+                    /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (1,8--1,12) }),
+              /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--2,8))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--2,8),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs b/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs
new file mode 100644
index 00000000000..78376b2b8a0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs
@@ -0,0 +1,5 @@
+{ new obj() with
+    member x.ToString() = "INotifyEnumerableInternal"
+  interface INotifyEnumerableInternal<'T>
+  interface IEnumerable<_> with
+    member x.GetEnumerator() = null }
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
new file mode 100644
index 00000000000..26bae5aefad
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
@@ -0,0 +1,141 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprObjExprContainsTheRangeOfWithKeyword.fs", false,
+      QualifiedNameOfFile SynExprObjExprContainsTheRangeOfWithKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynExprObjExprContainsTheRangeOfWithKeyword], false, AnonModule,
+          [Expr
+             (ObjExpr
+                (LongIdent (SynLongIdent ([obj], [], [None])),
+                 Some
+                   (Const
+                      (Unit,
+                       /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (1,9--1,11)),
+                    None),
+                 Some
+                   /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (1,12--1,16),
+                 [],
+                 [Member
+                    (SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (Some { IsInstance = true
+                                  IsDispatchSlot = false
+                                  IsOverrideOrExplicitImpl = true
+                                  IsFinal = false
+                                  GetterOrSetterIsCompilerGenerated = false
+                                  MemberKind = Member },
+                           SynValInfo
+                             ([[SynArgInfo ([], false, None)]; []],
+                              SynArgInfo ([], false, None)), None),
+                        LongIdent
+                          (SynLongIdent
+                             ([x; ToString],
+                              [/root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,12--2,13)],
+                              [None; None]), None, None,
+                           Pats
+                             [Paren
+                                (Const
+                                   (Unit,
+                                    /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,21--2,23)),
+                                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,21--2,23))],
+                           None,
+                           /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,11--2,23)),
+                        None,
+                        Const
+                          (String
+                             ("INotifyEnumerableInternal", Regular,
+                              /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,26--2,53)),
+                           /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,26--2,53)),
+                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,11--2,23),
+                        NoneAtInvisible,
+                        { LeadingKeyword =
+                           Member
+                             /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,4--2,10)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,24--2,25) }),
+                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,4--2,53))],
+                 [SynInterfaceImpl
+                    (App
+                       (LongIdent
+                          (SynLongIdent
+                             ([INotifyEnumerableInternal], [], [None])),
+                        Some
+                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,37--3,38),
+                        [Var
+                           (SynTypar (T, None, false),
+                            /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,38--3,40))],
+                        [],
+                        Some
+                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,40--3,41),
+                        false,
+                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,12--3,41)),
+                     None, [], [],
+                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,2--4,2));
+                  SynInterfaceImpl
+                    (App
+                       (LongIdent (SynLongIdent ([IEnumerable], [], [None])),
+                        Some
+                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,23--4,24),
+                        [Anon
+                           /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,24--4,25)],
+                        [],
+                        Some
+                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,25--4,26),
+                        false,
+                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,12--4,26)),
+                     Some
+                       /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,27--4,31),
+                     [],
+                     [Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = true
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([x; GetEnumerator],
+                                  [/root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,12--5,13)],
+                                  [None; None]), None, None,
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,26--5,28)),
+                                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,26--5,28))],
+                               None,
+                               /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,11--5,28)),
+                            None,
+                            Null
+                              /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,31--5,35),
+                            /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,11--5,28),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Member
+                                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,4--5,10)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,29--5,30) }),
+                         /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,4--5,35))],
+                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,2--5,37))],
+                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (1,2--1,11),
+                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (1,0--5,37)),
+              /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (1,0--5,37))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (1,0--5,37),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs b/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs
new file mode 100644
index 00000000000..a4cc5740fd6
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs
@@ -0,0 +1,6 @@
+let meh =
+    { new Interface with
+        override this.Foo () = ()
+        member this.Bar () = ()
+      interface SomethingElse with
+        member this.Blah () = () }
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs.bsl b/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs.bsl
new file mode 100644
index 00000000000..04f63f51967
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs.bsl
@@ -0,0 +1,169 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprObjMembersHaveCorrectKeywords.fs", false,
+      QualifiedNameOfFile SynExprObjMembersHaveCorrectKeywords, [], [],
+      [SynModuleOrNamespace
+         ([SynExprObjMembersHaveCorrectKeywords], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (meh, None), false, None,
+                     /root/SynExprObjMembersHaveCorrectKeywords.fs (1,4--1,7)),
+                  None,
+                  ObjExpr
+                    (LongIdent (SynLongIdent ([Interface], [], [None])), None,
+                     Some
+                       /root/SynExprObjMembersHaveCorrectKeywords.fs (2,20--2,24),
+                     [],
+                     [Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((3,8), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = true
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([this; Foo],
+                                  [/root/SynExprObjMembersHaveCorrectKeywords.fs (3,21--3,22)],
+                                  [None; None]), None, None,
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/SynExprObjMembersHaveCorrectKeywords.fs (3,26--3,28)),
+                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (3,26--3,28))],
+                               None,
+                               /root/SynExprObjMembersHaveCorrectKeywords.fs (3,17--3,28)),
+                            None,
+                            Const
+                              (Unit,
+                               /root/SynExprObjMembersHaveCorrectKeywords.fs (3,31--3,33)),
+                            /root/SynExprObjMembersHaveCorrectKeywords.fs (3,17--3,28),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Override
+                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (3,8--3,16)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (3,29--3,30) }),
+                         /root/SynExprObjMembersHaveCorrectKeywords.fs (3,8--3,33));
+                      Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((4,8), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = true
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([this; Bar],
+                                  [/root/SynExprObjMembersHaveCorrectKeywords.fs (4,19--4,20)],
+                                  [None; None]), None, None,
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/SynExprObjMembersHaveCorrectKeywords.fs (4,24--4,26)),
+                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (4,24--4,26))],
+                               None,
+                               /root/SynExprObjMembersHaveCorrectKeywords.fs (4,15--4,26)),
+                            None,
+                            Const
+                              (Unit,
+                               /root/SynExprObjMembersHaveCorrectKeywords.fs (4,29--4,31)),
+                            /root/SynExprObjMembersHaveCorrectKeywords.fs (4,15--4,26),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Member
+                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (4,8--4,14)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (4,27--4,28) }),
+                         /root/SynExprObjMembersHaveCorrectKeywords.fs (4,8--4,31))],
+                     [SynInterfaceImpl
+                        (LongIdent (SynLongIdent ([SomethingElse], [], [None])),
+                         Some
+                           /root/SynExprObjMembersHaveCorrectKeywords.fs (5,30--5,34),
+                         [],
+                         [Member
+                            (SynBinding
+                               (None, Normal, false, false, [],
+                                PreXmlDoc ((6,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                SynValData
+                                  (Some
+                                     { IsInstance = true
+                                       IsDispatchSlot = false
+                                       IsOverrideOrExplicitImpl = true
+                                       IsFinal = false
+                                       GetterOrSetterIsCompilerGenerated = false
+                                       MemberKind = Member },
+                                   SynValInfo
+                                     ([[SynArgInfo ([], false, None)]; []],
+                                      SynArgInfo ([], false, None)), None),
+                                LongIdent
+                                  (SynLongIdent
+                                     ([this; Blah],
+                                      [/root/SynExprObjMembersHaveCorrectKeywords.fs (6,19--6,20)],
+                                      [None; None]), None, None,
+                                   Pats
+                                     [Paren
+                                        (Const
+                                           (Unit,
+                                            /root/SynExprObjMembersHaveCorrectKeywords.fs (6,25--6,27)),
+                                         /root/SynExprObjMembersHaveCorrectKeywords.fs (6,25--6,27))],
+                                   None,
+                                   /root/SynExprObjMembersHaveCorrectKeywords.fs (6,15--6,27)),
+                                None,
+                                Const
+                                  (Unit,
+                                   /root/SynExprObjMembersHaveCorrectKeywords.fs (6,30--6,32)),
+                                /root/SynExprObjMembersHaveCorrectKeywords.fs (6,15--6,27),
+                                NoneAtInvisible,
+                                { LeadingKeyword =
+                                   Member
+                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (6,8--6,14)
+                                  InlineKeyword = None
+                                  EqualsRange =
+                                   Some
+                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (6,28--6,29) }),
+                             /root/SynExprObjMembersHaveCorrectKeywords.fs (6,8--6,32))],
+                         /root/SynExprObjMembersHaveCorrectKeywords.fs (5,6--6,34))],
+                     /root/SynExprObjMembersHaveCorrectKeywords.fs (2,6--2,19),
+                     /root/SynExprObjMembersHaveCorrectKeywords.fs (2,4--6,34)),
+                  /root/SynExprObjMembersHaveCorrectKeywords.fs (1,4--1,7),
+                  Yes /root/SynExprObjMembersHaveCorrectKeywords.fs (1,0--6,34),
+                  { LeadingKeyword =
+                     Let
+                       /root/SynExprObjMembersHaveCorrectKeywords.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/SynExprObjMembersHaveCorrectKeywords.fs (1,8--1,9) })],
+              /root/SynExprObjMembersHaveCorrectKeywords.fs (1,0--6,34))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprObjMembersHaveCorrectKeywords.fs (1,0--6,34),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs b/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs
new file mode 100644
index 00000000000..748b583850a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs
@@ -0,0 +1,6 @@
+[<AbstractClass>]
+type CFoo() =
+    abstract AbstractClassPropertySet: string with set
+
+{ new CFoo() with
+    override this.AbstractClassPropertySet with set (v:string) = () }
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs.bsl b/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs.bsl
new file mode 100644
index 00000000000..8c871ee32a7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs.bsl
@@ -0,0 +1,138 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprObjWithSetter.fs", false,
+      QualifiedNameOfFile SynExprObjWithSetter, [], [],
+      [SynModuleOrNamespace
+         ([SynExprObjWithSetter], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([{ Attributes =
+                         [{ TypeName =
+                             SynLongIdent ([AbstractClass], [], [None])
+                            ArgExpr =
+                             Const
+                               (Unit, /root/SynExprObjWithSetter.fs (1,2--1,15))
+                            Target = None
+                            AppliesToGetterAndSetter = false
+                            Range = /root/SynExprObjWithSetter.fs (1,2--1,15) }]
+                        Range = /root/SynExprObjWithSetter.fs (1,0--1,17) }],
+                     None, [], [CFoo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/SynExprObjWithSetter.fs (2,5--2,9)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([], /root/SynExprObjWithSetter.fs (2,9--2,11)), None,
+                         PreXmlDoc ((2,9), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynExprObjWithSetter.fs (2,5--2,9),
+                         { AsKeyword = None });
+                      AbstractSlot
+                        (SynValSig
+                           ([], SynIdent (AbstractClassPropertySet, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([string], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SynExprObjWithSetter.fs (3,4--3,54),
+                            { LeadingKeyword =
+                               Abstract
+                                 /root/SynExprObjWithSetter.fs (3,4--3,12)
+                              InlineKeyword = None
+                              WithKeyword =
+                               Some /root/SynExprObjWithSetter.fs (3,46--3,50)
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertySet },
+                         /root/SynExprObjWithSetter.fs (3,4--3,54),
+                         { GetSetKeywords =
+                            Some
+                              (Set /root/SynExprObjWithSetter.fs (3,51--3,54)) })],
+                     /root/SynExprObjWithSetter.fs (3,4--3,54)), [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([], /root/SynExprObjWithSetter.fs (2,9--2,11)), None,
+                        PreXmlDoc ((2,9), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynExprObjWithSetter.fs (2,5--2,9),
+                        { AsKeyword = None })),
+                  /root/SynExprObjWithSetter.fs (1,0--3,54),
+                  { LeadingKeyword =
+                     Type /root/SynExprObjWithSetter.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/SynExprObjWithSetter.fs (2,12--2,13)
+                    WithKeyword = None })],
+              /root/SynExprObjWithSetter.fs (1,0--3,54));
+           Expr
+             (ObjExpr
+                (LongIdent (SynLongIdent ([CFoo], [], [None])),
+                 Some
+                   (Const (Unit, /root/SynExprObjWithSetter.fs (5,10--5,12)),
+                    None), Some /root/SynExprObjWithSetter.fs (5,13--5,17), [],
+                 [GetSetMember
+                    (None,
+                     Some
+                       (SynBinding
+                          (None, Normal, false, false, [],
+                           PreXmlMerge
+  (PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                           SynValData
+                             (Some { IsInstance = true
+                                     IsDispatchSlot = false
+                                     IsOverrideOrExplicitImpl = true
+                                     IsFinal = false
+                                     GetterOrSetterIsCompilerGenerated = false
+                                     MemberKind = PropertySet },
+                              SynValInfo
+                                ([[SynArgInfo ([], false, None)];
+                                  [SynArgInfo ([], false, Some v)]],
+                                 SynArgInfo ([], false, None)), None),
+                           LongIdent
+                             (SynLongIdent
+                                ([this; AbstractClassPropertySet],
+                                 [/root/SynExprObjWithSetter.fs (6,17--6,18)],
+                                 [None; None]), Some set, None,
+                              Pats
+                                [Paren
+                                   (Typed
+                                      (Named
+                                         (SynIdent (v, None), false, None,
+                                          /root/SynExprObjWithSetter.fs (6,53--6,54)),
+                                       LongIdent
+                                         (SynLongIdent ([string], [], [None])),
+                                       /root/SynExprObjWithSetter.fs (6,53--6,61)),
+                                    /root/SynExprObjWithSetter.fs (6,52--6,62))],
+                              None, /root/SynExprObjWithSetter.fs (6,48--6,62)),
+                           None,
+                           Const
+                             (Unit, /root/SynExprObjWithSetter.fs (6,65--6,67)),
+                           /root/SynExprObjWithSetter.fs (6,48--6,62),
+                           NoneAtInvisible,
+                           { LeadingKeyword =
+                              Override /root/SynExprObjWithSetter.fs (6,4--6,12)
+                             InlineKeyword = None
+                             EqualsRange =
+                              Some /root/SynExprObjWithSetter.fs (6,63--6,64) })),
+                     /root/SynExprObjWithSetter.fs (6,4--6,67),
+                     { InlineKeyword = None
+                       WithKeyword = /root/SynExprObjWithSetter.fs (6,43--6,47)
+                       GetKeyword = None
+                       AndKeyword = None
+                       SetKeyword =
+                        Some /root/SynExprObjWithSetter.fs (6,48--6,51) })], [],
+                 /root/SynExprObjWithSetter.fs (5,2--5,12),
+                 /root/SynExprObjWithSetter.fs (5,0--6,69)),
+              /root/SynExprObjWithSetter.fs (5,0--6,69))], PreXmlDocEmpty, [],
+          None, /root/SynExprObjWithSetter.fs (1,0--6,69),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs b/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
new file mode 100644
index 00000000000..bb79bee4911
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
@@ -0,0 +1,6 @@
+{ V = v
+  X      =   // some comment
+                someLongFunctionCall
+                    a
+                    b
+                    c }
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
new file mode 100644
index 00000000000..d6b1b350d8f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
@@ -0,0 +1,48 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs",
+      false,
+      QualifiedNameOfFile
+        SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField, [], [],
+      [SynModuleOrNamespace
+         ([SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField],
+          false, AnonModule,
+          [Expr
+             (Record
+                (None, None,
+                 [SynExprRecordField
+                    ((SynLongIdent ([V], [], [None]), true),
+                     Some
+                       /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,4--1,5),
+                     Some (Ident v),
+                     Some
+                       (/root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,8--2,2),
+                        None));
+                  SynExprRecordField
+                    ((SynLongIdent ([X], [], [None]), true),
+                     Some
+                       /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,9--2,10),
+                     Some
+                       (App
+                          (NonAtomic, false,
+                           App
+                             (NonAtomic, false,
+                              App
+                                (NonAtomic, false, Ident someLongFunctionCall,
+                                 Ident a,
+                                 /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,16--4,21)),
+                              Ident b,
+                              /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,16--5,21)),
+                           Ident c,
+                           /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,16--6,21))),
+                     None)],
+                 /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--6,23)),
+              /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--6,23))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--6,23),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,13--2,28)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs b/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs
new file mode 100644
index 00000000000..e3294c94c7a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs
@@ -0,0 +1,4 @@
+{ JobType = EsriBoundaryImport
+      FileToImport = filePath
+      State = state
+      DryRun = args.DryRun }
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl b/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
new file mode 100644
index 00000000000..791d9bbe3f7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
@@ -0,0 +1,79 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs", false,
+      QualifiedNameOfFile SynExprRecordFieldsContainCorrectAmountOfTrivia, [],
+      [],
+      [SynModuleOrNamespace
+         ([SynExprRecordFieldsContainCorrectAmountOfTrivia], false, AnonModule,
+          [Expr
+             (Record
+                (None, None,
+                 [SynExprRecordField
+                    ((SynLongIdent ([JobType], [], [None]), true),
+                     Some
+                       /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,10--1,11),
+                     Some
+                       (App
+                          (NonAtomic, false,
+                           App
+                             (NonAtomic, true,
+                              LongIdent
+                                (false,
+                                 SynLongIdent
+                                   ([op_Equality], [],
+                                    [Some (OriginalNotation "=")]), None,
+                                 /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (4,13--4,14)),
+                              App
+                                (NonAtomic, false,
+                                 App
+                                   (NonAtomic, true,
+                                    LongIdent
+                                      (false,
+                                       SynLongIdent
+                                         ([op_Equality], [],
+                                          [Some (OriginalNotation "=")]), None,
+                                       /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (3,12--3,13)),
+                                    App
+                                      (NonAtomic, false,
+                                       App
+                                         (NonAtomic, true,
+                                          LongIdent
+                                            (false,
+                                             SynLongIdent
+                                               ([op_Equality], [],
+                                                [Some (OriginalNotation "=")]),
+                                             None,
+                                             /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,19--2,20)),
+                                          App
+                                            (NonAtomic, false,
+                                             Ident EsriBoundaryImport,
+                                             Ident FileToImport,
+                                             /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--2,18)),
+                                          /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--2,20)),
+                                       App
+                                         (NonAtomic, false, Ident filePath,
+                                          Ident State,
+                                          /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,21--3,11)),
+                                       /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--3,11)),
+                                    /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--3,13)),
+                                 App
+                                   (NonAtomic, false, Ident state, Ident DryRun,
+                                    /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (3,14--4,12)),
+                                 /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--4,12)),
+                              /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--4,14)),
+                           LongIdent
+                             (false,
+                              SynLongIdent
+                                ([args; DryRun],
+                                 [/root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (4,19--4,20)],
+                                 [None; None]), None,
+                              /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (4,15--4,26)),
+                           /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--4,26))),
+                     None)],
+                 /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,0--4,28)),
+              /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,0--4,28))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,0--4,28),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs b/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs
new file mode 100644
index 00000000000..7a0c1c43786
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs
@@ -0,0 +1 @@
+x?v <- 2
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs.bsl b/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs.bsl
new file mode 100644
index 00000000000..49b6894fa88
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs.bsl
@@ -0,0 +1,19 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprSetWithSynExprDynamic.fs", false,
+      QualifiedNameOfFile SynExprSetWithSynExprDynamic, [], [],
+      [SynModuleOrNamespace
+         ([SynExprSetWithSynExprDynamic], false, AnonModule,
+          [Expr
+             (Set
+                (Dynamic
+                   (Ident x, /root/SynExprSetWithSynExprDynamic.fs (1,1--1,2),
+                    Ident v, /root/SynExprSetWithSynExprDynamic.fs (1,0--1,3)),
+                 Const
+                   (Int32 2, /root/SynExprSetWithSynExprDynamic.fs (1,7--1,8)),
+                 /root/SynExprSetWithSynExprDynamic.fs (1,0--1,8)),
+              /root/SynExprSetWithSynExprDynamic.fs (1,0--1,8))], PreXmlDocEmpty,
+          [], None, /root/SynExprSetWithSynExprDynamic.fs (1,0--1,8),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs b/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs
new file mode 100644
index 00000000000..753101ee24e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs
@@ -0,0 +1,4 @@
+try
+x
+finally
+()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
new file mode 100644
index 00000000000..342a1d289b6
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
@@ -0,0 +1,29 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs", false,
+      QualifiedNameOfFile
+        SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword], false,
+          AnonModule,
+          [Expr
+             (TryFinally
+                (Ident x,
+                 Const
+                   (Unit,
+                    /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,2)),
+                 /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--4,2),
+                 Yes
+                   /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--1,3),
+                 Yes
+                   /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (3,0--3,7),
+                 { TryKeyword =
+                    /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--1,3)
+                   FinallyKeyword =
+                    /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (3,0--3,7) }),
+              /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--4,2))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--4,2),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs b/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs
new file mode 100644
index 00000000000..3b92c0aa3f1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs
@@ -0,0 +1,4 @@
+try
+x
+with
+| ex -> y
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
new file mode 100644
index 00000000000..b9499b9df13
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
@@ -0,0 +1,43 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs", false,
+      QualifiedNameOfFile SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword], false,
+          AnonModule,
+          [Expr
+             (TryWith
+                (Ident x,
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,2--4,4)),
+                     None, Ident y,
+                     /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,2--4,9),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,5--4,7)
+                       BarRange =
+                        Some
+                          /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,1) })],
+                 /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--4,9),
+                 Yes
+                   /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--1,3),
+                 Yes
+                   /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (3,0--3,4),
+                 { TryKeyword =
+                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--1,3)
+                   TryToWithRange =
+                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--3,4)
+                   WithKeyword =
+                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (3,0--3,4)
+                   WithToEndRange =
+                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (3,0--4,9) }),
+              /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--4,9))],
+          PreXmlDocEmpty, [], None,
+          /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--4,9),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs b/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs
new file mode 100644
index 00000000000..0cacccaeb02
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs
@@ -0,0 +1 @@
+40u<hr / (staff weeks)>
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs.bsl b/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs.bsl
new file mode 100644
index 00000000000..e54047c1e0e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs.bsl
@@ -0,0 +1,37 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynMeasureParenHasCorrectRange.fs", false,
+      QualifiedNameOfFile SynMeasureParenHasCorrectRange, [], [],
+      [SynModuleOrNamespace
+         ([SynMeasureParenHasCorrectRange], false, AnonModule,
+          [Expr
+             (Const
+                (Measure
+                   (UInt32 40u,
+                    /root/SynMeasureParenHasCorrectRange.fs (1,0--1,3),
+                    Divide
+                      (Seq
+                         ([Named
+                             ([hr],
+                              /root/SynMeasureParenHasCorrectRange.fs (1,4--1,6))],
+                          /root/SynMeasureParenHasCorrectRange.fs (1,4--1,6)),
+                       Seq
+                         ([Paren
+                             (Seq
+                                ([Named
+                                    ([staff],
+                                     /root/SynMeasureParenHasCorrectRange.fs (1,10--1,15));
+                                  Named
+                                    ([weeks],
+                                     /root/SynMeasureParenHasCorrectRange.fs (1,16--1,21))],
+                                 /root/SynMeasureParenHasCorrectRange.fs (1,10--1,21)),
+                              /root/SynMeasureParenHasCorrectRange.fs (1,9--1,22))],
+                          /root/SynMeasureParenHasCorrectRange.fs (1,9--1,22)),
+                       /root/SynMeasureParenHasCorrectRange.fs (1,4--1,22))),
+                 /root/SynMeasureParenHasCorrectRange.fs (1,0--1,23)),
+              /root/SynMeasureParenHasCorrectRange.fs (1,0--1,23))],
+          PreXmlDocEmpty, [], None,
+          /root/SynMeasureParenHasCorrectRange.fs (1,0--1,23),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs b/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs
new file mode 100644
index 00000000000..e9d0d43dd71
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs
@@ -0,0 +1,3 @@
+type Foo =
+    abstract X : int
+    abstract member Y: int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
new file mode 100644
index 00000000000..0984cf7f0e9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
@@ -0,0 +1,80 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs", false,
+      QualifiedNameOfFile SynMemberDefnAbstractSlotHasCorrectKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynMemberDefnAbstractSlotHasCorrectKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (1,5--1,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [AbstractSlot
+                        (SynValSig
+                           ([], SynIdent (X, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,4--2,20),
+                            { LeadingKeyword =
+                               Abstract
+                                 /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,4--2,12)
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,4--2,20),
+                         { GetSetKeywords = None });
+                      AbstractSlot
+                        (SynValSig
+                           ([], SynIdent (Y, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,26),
+                            { LeadingKeyword =
+                               AbstractMember
+                                 (/root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,12),
+                                  /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,13--3,19))
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,26),
+                         { GetSetKeywords = None })],
+                     /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,4--3,26)),
+                  [], None,
+                  /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (1,5--3,26),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (1,0--3,26))],
+          PreXmlDocEmpty, [], None,
+          /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (1,0--3,26),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs b/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs
new file mode 100644
index 00000000000..831cf06b4b1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs
@@ -0,0 +1,5 @@
+type Foo =
+    static member val W : int = 1
+    member val X : int = 1
+    override val Y : int = 2
+    default val Z : int = 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
new file mode 100644
index 00000000000..62a0f2a38d8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
@@ -0,0 +1,152 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs", false,
+      QualifiedNameOfFile SynMemberDefnAutoPropertyHasCorrectKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynMemberDefnAutoPropertyHasCorrectKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (1,5--1,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [AutoProperty
+                        ([], true, W,
+                         Some (LongIdent (SynLongIdent ([int], [], [None]))),
+                         Member, { IsInstance = false
+                                   IsDispatchSlot = false
+                                   IsOverrideOrExplicitImpl = false
+                                   IsFinal = false
+                                   GetterOrSetterIsCompilerGenerated = false
+                                   MemberKind = Member },
+                         { IsInstance = false
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertySet },
+                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None,
+                         Const
+                           (Int32 1,
+                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,32--2,33)),
+                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,4--2,33),
+                         { LeadingKeyword =
+                            StaticMemberVal
+                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,4--2,10),
+                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,11--2,17),
+                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,18--2,21))
+                           WithKeyword = None
+                           EqualsRange =
+                            Some
+                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,30--2,31)
+                           GetSetKeywords = None });
+                      AutoProperty
+                        ([], false, X,
+                         Some (LongIdent (SynLongIdent ([int], [], [None]))),
+                         Member, { IsInstance = true
+                                   IsDispatchSlot = false
+                                   IsOverrideOrExplicitImpl = false
+                                   IsFinal = false
+                                   GetterOrSetterIsCompilerGenerated = false
+                                   MemberKind = Member },
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertySet },
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None,
+                         Const
+                           (Int32 1,
+                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,25--3,26)),
+                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,4--3,26),
+                         { LeadingKeyword =
+                            MemberVal
+                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,4--3,10),
+                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,11--3,14))
+                           WithKeyword = None
+                           EqualsRange =
+                            Some
+                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,23--3,24)
+                           GetSetKeywords = None });
+                      AutoProperty
+                        ([], false, Y,
+                         Some (LongIdent (SynLongIdent ([int], [], [None]))),
+                         Member, { IsInstance = true
+                                   IsDispatchSlot = false
+                                   IsOverrideOrExplicitImpl = true
+                                   IsFinal = false
+                                   GetterOrSetterIsCompilerGenerated = false
+                                   MemberKind = Member },
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = true
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertySet },
+                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None,
+                         Const
+                           (Int32 2,
+                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,27--4,28)),
+                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,4--4,28),
+                         { LeadingKeyword =
+                            OverrideVal
+                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,4--4,12),
+                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,13--4,16))
+                           WithKeyword = None
+                           EqualsRange =
+                            Some
+                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,25--4,26)
+                           GetSetKeywords = None });
+                      AutoProperty
+                        ([], false, Z,
+                         Some (LongIdent (SynLongIdent ([int], [], [None]))),
+                         Member, { IsInstance = true
+                                   IsDispatchSlot = false
+                                   IsOverrideOrExplicitImpl = true
+                                   IsFinal = false
+                                   GetterOrSetterIsCompilerGenerated = false
+                                   MemberKind = Member },
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = true
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertySet },
+                         PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None,
+                         Const
+                           (Int32 1,
+                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,26--5,27)),
+                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,4--5,27),
+                         { LeadingKeyword =
+                            DefaultVal
+                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,4--5,11),
+                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,12--5,15))
+                           WithKeyword = None
+                           EqualsRange =
+                            Some
+                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,24--5,25)
+                           GetSetKeywords = None })],
+                     /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,4--5,27)),
+                  [], None,
+                  /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (1,5--5,27),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (1,0--5,27))],
+          PreXmlDocEmpty, [], None,
+          /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (1,0--5,27),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs
new file mode 100644
index 00000000000..e0163cf4e4f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs
@@ -0,0 +1,4 @@
+type Foo() =
+    interface Bar with
+        member Meh () = ()
+    interface Other
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
new file mode 100644
index 00000000000..806f323d5d4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -0,0 +1,103 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs", false,
+      QualifiedNameOfFile SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                         None,
+                         PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                         { AsKeyword = None });
+                      Interface
+                        (LongIdent (SynLongIdent ([Bar], [], [None])),
+                         Some
+                           /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,18--2,22),
+                         Some
+                           [Member
+                              (SynBinding
+                                 (None, Normal, false, false, [],
+                                  PreXmlDoc ((3,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                  SynValData
+                                    (Some
+                                       { IsInstance = true
+                                         IsDispatchSlot = false
+                                         IsOverrideOrExplicitImpl = true
+                                         IsFinal = false
+                                         GetterOrSetterIsCompilerGenerated =
+                                          false
+                                         MemberKind = Member },
+                                     SynValInfo
+                                       ([[SynArgInfo ([], false, None)]; []],
+                                        SynArgInfo ([], false, None)), None),
+                                  LongIdent
+                                    (SynLongIdent ([Meh], [], [None]), None,
+                                     None,
+                                     Pats
+                                       [Paren
+                                          (Const
+                                             (Unit,
+                                              /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,19--3,21)),
+                                           /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,19--3,21))],
+                                     None,
+                                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,15--3,21)),
+                                  None,
+                                  Const
+                                    (Unit,
+                                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,24--3,26)),
+                                  /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,15--3,21),
+                                  NoneAtInvisible,
+                                  { LeadingKeyword =
+                                     Member
+                                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,8--3,14)
+                                    InlineKeyword = None
+                                    EqualsRange =
+                                     Some
+                                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,22--3,23) }),
+                               /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,8--3,26))],
+                         /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,4--3,26));
+                      Interface
+                        (LongIdent (SynLongIdent ([Other], [], [None])), None,
+                         None,
+                         /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,4--4,19))],
+                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,4--4,19)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                        None,
+                        PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                        { AsKeyword = None })),
+                  /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,5--4,19),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,11--1,12)
+                    WithKeyword = None })],
+              /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,0--4,19))],
+          PreXmlDocEmpty, [], None,
+          /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,0--4,19),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs b/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs
new file mode 100644
index 00000000000..cb35603078b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs
@@ -0,0 +1,5 @@
+type Foo =
+    static member this.B() = ()
+    member this.A() = ()
+    override this.C() = ()
+    default this.D() = ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
new file mode 100644
index 00000000000..3d9dddc193f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
@@ -0,0 +1,195 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs", false,
+      QualifiedNameOfFile SynMemberDefnMemberSynValDataHasCorrectKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynMemberDefnMemberSynValDataHasCorrectKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (1,5--1,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = false
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo ([[]], SynArgInfo ([], false, None)),
+                               None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([this; B],
+                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,22--2,23)],
+                                  [None; None]), None, None,
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,24--2,26)),
+                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,24--2,26))],
+                               None,
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,18--2,26)),
+                            None,
+                            Const
+                              (Unit,
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,29--2,31)),
+                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,18--2,26),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               StaticMember
+                                 (/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,4--2,10),
+                                  /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,11--2,17))
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,27--2,28) }),
+                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,4--2,31));
+                      Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([this; A],
+                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,15--3,16)],
+                                  [None; None]), None, None,
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,17--3,19)),
+                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,17--3,19))],
+                               None,
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,11--3,19)),
+                            None,
+                            Const
+                              (Unit,
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,22--3,24)),
+                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,11--3,19),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Member
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,4--3,10)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,20--3,21) }),
+                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,4--3,24));
+                      Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = true
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([this; C],
+                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,17--4,18)],
+                                  [None; None]), None, None,
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,19--4,21)),
+                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,19--4,21))],
+                               None,
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,13--4,21)),
+                            None,
+                            Const
+                              (Unit,
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,24--4,26)),
+                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,13--4,21),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Override
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,4--4,12)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,22--4,23) }),
+                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,4--4,26));
+                      Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = true
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([this; D],
+                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,16--5,17)],
+                                  [None; None]), None, None,
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,18--5,20)),
+                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,18--5,20))],
+                               None,
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,12--5,20)),
+                            None,
+                            Const
+                              (Unit,
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,23--5,25)),
+                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,12--5,20),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Default
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,4--5,11)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,21--5,22) }),
+                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,4--5,25))],
+                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,4--5,25)),
+                  [], None,
+                  /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (1,5--5,25),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (1,0--5,25))],
+          PreXmlDocEmpty, [], None,
+          /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (1,0--5,25),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi b/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi
new file mode 100644
index 00000000000..97452254a2d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi
@@ -0,0 +1,9 @@
+namespace X
+
+type Y =
+    abstract A : int
+    abstract member B : double
+    static member C : string
+    member D : int
+    override E : int
+    default F : int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi.bsl b/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
new file mode 100644
index 00000000000..9179b48a9a0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
@@ -0,0 +1,177 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SynMemberSigMemberHasCorrectKeywords.fsi",
+      QualifiedNameOfFile SynMemberSigMemberHasCorrectKeywords, [], [],
+      [SynModuleOrNamespaceSig
+         ([X], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Y],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynMemberSigMemberHasCorrectKeywords.fsi (3,5--3,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynValSig
+                           ([], SynIdent (A, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,4--4,20),
+                            { LeadingKeyword =
+                               Abstract
+                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,4--4,12)
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,4--4,20),
+                         { GetSetKeywords = None });
+                      Member
+                        (SynValSig
+                           ([], SynIdent (B, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([double], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,30),
+                            { LeadingKeyword =
+                               AbstractMember
+                                 (/root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,12),
+                                  /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,13--5,19))
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,30),
+                         { GetSetKeywords = None });
+                      Member
+                        (SynValSig
+                           ([], SynIdent (C, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([string], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,28),
+                            { LeadingKeyword =
+                               StaticMember
+                                 (/root/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,10),
+                                  /root/SynMemberSigMemberHasCorrectKeywords.fsi (6,11--6,17))
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = false
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,28),
+                         { GetSetKeywords = None });
+                      Member
+                        (SynValSig
+                           ([], SynIdent (D, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((7,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,18),
+                            { LeadingKeyword =
+                               Member
+                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,10)
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,18),
+                         { GetSetKeywords = None });
+                      Member
+                        (SynValSig
+                           ([], SynIdent (E, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((8,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,20),
+                            { LeadingKeyword =
+                               Override
+                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,12)
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = true
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,20),
+                         { GetSetKeywords = None });
+                      Member
+                        (SynValSig
+                           ([], SynIdent (F, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((9,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,19),
+                            { LeadingKeyword =
+                               Default
+                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,11)
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = true
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,19),
+                         { GetSetKeywords = None })],
+                     /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,4--9,19)),
+                  [], /root/SynMemberSigMemberHasCorrectKeywords.fsi (3,5--9,19),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynMemberSigMemberHasCorrectKeywords.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some
+                       /root/SynMemberSigMemberHasCorrectKeywords.fsi (3,7--3,8)
+                    WithKeyword = None })],
+              /root/SynMemberSigMemberHasCorrectKeywords.fsi (3,0--9,19))],
+          PreXmlDocEmpty, [], None,
+          /root/SynMemberSigMemberHasCorrectKeywords.fsi (1,0--9,19),
+          { LeadingKeyword =
+             Namespace /root/SynMemberSigMemberHasCorrectKeywords.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs b/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs
new file mode 100644
index 00000000000..2e73c87e9af
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs
@@ -0,0 +1,4 @@
+match x with
+| A
+| B -> ()
+| _ -> ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs.bsl b/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs.bsl
new file mode 100644
index 00000000000..09b65ba0f82
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs.bsl
@@ -0,0 +1,58 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynPatOrContainsTheRangeOfTheBar.fs", false,
+      QualifiedNameOfFile SynPatOrContainsTheRangeOfTheBar, [], [],
+      [SynModuleOrNamespace
+         ([SynPatOrContainsTheRangeOfTheBar], false, AnonModule,
+          [Expr
+             (Match
+                (Yes /root/SynPatOrContainsTheRangeOfTheBar.fs (1,0--1,12),
+                 Ident x,
+                 [SynMatchClause
+                    (Or
+                       (LongIdent
+                          (SynLongIdent ([A], [], [None]), None, None, Pats [],
+                           None,
+                           /root/SynPatOrContainsTheRangeOfTheBar.fs (2,2--2,3)),
+                        LongIdent
+                          (SynLongIdent ([B], [], [None]), None, None, Pats [],
+                           None,
+                           /root/SynPatOrContainsTheRangeOfTheBar.fs (3,2--3,3)),
+                        /root/SynPatOrContainsTheRangeOfTheBar.fs (2,2--3,3),
+                        { BarRange =
+                           /root/SynPatOrContainsTheRangeOfTheBar.fs (3,0--3,1) }),
+                     None,
+                     Const
+                       (Unit,
+                        /root/SynPatOrContainsTheRangeOfTheBar.fs (3,7--3,9)),
+                     /root/SynPatOrContainsTheRangeOfTheBar.fs (2,2--3,9), Yes,
+                     { ArrowRange =
+                        Some
+                          /root/SynPatOrContainsTheRangeOfTheBar.fs (3,4--3,6)
+                       BarRange =
+                        Some
+                          /root/SynPatOrContainsTheRangeOfTheBar.fs (2,0--2,1) });
+                  SynMatchClause
+                    (Wild /root/SynPatOrContainsTheRangeOfTheBar.fs (4,2--4,3),
+                     None,
+                     Const
+                       (Unit,
+                        /root/SynPatOrContainsTheRangeOfTheBar.fs (4,7--4,9)),
+                     /root/SynPatOrContainsTheRangeOfTheBar.fs (4,2--4,9), Yes,
+                     { ArrowRange =
+                        Some
+                          /root/SynPatOrContainsTheRangeOfTheBar.fs (4,4--4,6)
+                       BarRange =
+                        Some
+                          /root/SynPatOrContainsTheRangeOfTheBar.fs (4,0--4,1) })],
+                 /root/SynPatOrContainsTheRangeOfTheBar.fs (1,0--4,9),
+                 { MatchKeyword =
+                    /root/SynPatOrContainsTheRangeOfTheBar.fs (1,0--1,5)
+                   WithKeyword =
+                    /root/SynPatOrContainsTheRangeOfTheBar.fs (1,8--1,12) }),
+              /root/SynPatOrContainsTheRangeOfTheBar.fs (1,0--4,9))],
+          PreXmlDocEmpty, [], None,
+          /root/SynPatOrContainsTheRangeOfTheBar.fs (1,0--4,9),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs
new file mode 100644
index 00000000000..dea1193b860
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs
@@ -0,0 +1,3 @@
+match x with
+| { Foo = bar } -> ()
+| _ -> ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..7ed01b3e018
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,57 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs", false,
+      QualifiedNameOfFile SynPatRecordContainsTheRangeOfTheEqualsSign, [], [],
+      [SynModuleOrNamespace
+         ([SynPatRecordContainsTheRangeOfTheEqualsSign], false, AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (1,0--1,12),
+                 Ident x,
+                 [SynMatchClause
+                    (Record
+                       ([(([], Foo),
+                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,8--2,9),
+                          Named
+                            (SynIdent (bar, None), false, None,
+                             /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,10--2,13)))],
+                        /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,2--2,15)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,19--2,21)),
+                     /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,2--2,21),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,16--2,18)
+                       BarRange =
+                        Some
+                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--2,1) });
+                  SynMatchClause
+                    (Wild
+                       /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,2--3,3),
+                     None,
+                     Const
+                       (Unit,
+                        /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,7--3,9)),
+                     /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,2--3,9),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,4--3,6)
+                       BarRange =
+                        Some
+                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,0--3,1) })],
+                 /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (1,0--3,9),
+                 { MatchKeyword =
+                    /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (1,0--1,5)
+                   WithKeyword =
+                    /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (1,8--1,12) }),
+              /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (1,0--3,9))],
+          PreXmlDocEmpty, [], None,
+          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (1,0--3,9),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi b/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi
new file mode 100644
index 00000000000..a93f25a4250
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi
@@ -0,0 +1,4 @@
+namespace X
+
+type Foo with
+member Meh : unit -> unit
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
new file mode 100644
index 00000000000..e3f9f353b26
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
@@ -0,0 +1,63 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi",
+      QualifiedNameOfFile SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword,
+      [], [],
+      [SynModuleOrNamespaceSig
+         ([X], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,5--3,8)),
+                  Simple
+                    (None
+                       /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,5--4,25),
+                     /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,5--4,25)),
+                  [Member
+                     (SynValSig
+                        ([], SynIdent (Meh, None), SynValTyparDecls (None, true),
+                         Fun
+                           (LongIdent (SynLongIdent ([unit], [], [None])),
+                            LongIdent (SynLongIdent ([unit], [], [None])),
+                            /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,13--4,25),
+                            { ArrowRange =
+                               /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,18--4,20) }),
+                         SynValInfo
+                           ([[SynArgInfo ([], false, None)]],
+                            SynArgInfo ([], false, None)), false, false,
+                         PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                         None, None,
+                         /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,25),
+                         { LeadingKeyword =
+                            Member
+                              /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,6)
+                           InlineKeyword = None
+                           WithKeyword = None
+                           EqualsRange = None }),
+                      { IsInstance = true
+                        IsDispatchSlot = false
+                        IsOverrideOrExplicitImpl = false
+                        IsFinal = false
+                        GetterOrSetterIsCompilerGenerated = false
+                        MemberKind = Member },
+                      /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,25),
+                      { GetSetKeywords = None })],
+                  /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,5--4,25),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--3,4)
+                    EqualsRange = None
+                    WithKeyword =
+                     Some
+                       /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,9--3,13) })],
+              /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--4,25))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (1,0--4,25),
+          { LeadingKeyword =
+             Namespace
+               /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi b/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi
new file mode 100644
index 00000000000..f34388b4fdc
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi
@@ -0,0 +1,5 @@
+namespace SomeNamespace
+
+type Bear =
+    | BlackBear = 1
+    | PolarBear = 2
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
new file mode 100644
index 00000000000..f0fae24d4ff
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -0,0 +1,59 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi",
+      QualifiedNameOfFile SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign,
+      [], [],
+      [SynModuleOrNamespaceSig
+         ([SomeNamespace], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Bear],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (3,5--3,9)),
+                  Simple
+                    (Enum
+                       ([SynEnumCase
+                           ([], SynIdent (BlackBear, None),
+                            Const
+                              (Int32 1,
+                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,18--4,19)),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,6--4,19),
+                            { BarRange =
+                               Some
+                                 /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,4--4,5)
+                              EqualsRange =
+                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,16--4,17) });
+                         SynEnumCase
+                           ([], SynIdent (PolarBear, None),
+                            Const
+                              (Int32 2,
+                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,18--5,19)),
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,6--5,19),
+                            { BarRange =
+                               Some
+                                 /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,4--5,5)
+                              EqualsRange =
+                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,16--5,17) })],
+                        /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,4--5,19)),
+                     /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,4--5,19)),
+                  [],
+                  /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (3,5--5,19),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (3,10--3,11)
+                    WithKeyword = None })],
+              /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (3,0--5,19))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (1,0--5,19),
+          { LeadingKeyword =
+             Namespace
+               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi
new file mode 100644
index 00000000000..616212dc8ad
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi
@@ -0,0 +1,5 @@
+namespace SomeNamespace
+
+type Foobar =
+    class
+    end
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
new file mode 100644
index 00000000000..f74eeb4ee5a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -0,0 +1,35 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi",
+      QualifiedNameOfFile
+        SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([SomeNamespace], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Foobar],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (3,5--3,11)),
+                  ObjectModel
+                    (Class, [],
+                     /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,4--5,7)),
+                  [],
+                  /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (3,5--5,7),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (3,12--3,13)
+                    WithKeyword = None })],
+              /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (3,0--5,7))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (1,0--5,7),
+          { LeadingKeyword =
+             Namespace
+               /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi
new file mode 100644
index 00000000000..13a4b7b07d9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi
@@ -0,0 +1,3 @@
+namespace Foo
+
+type X = delegate of string -> string
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
new file mode 100644
index 00000000000..805e7f5d6d4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -0,0 +1,71 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi",
+      QualifiedNameOfFile
+        SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([Foo], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,5--3,6)),
+                  ObjectModel
+                    (Delegate
+                       (Fun
+                          (LongIdent (SynLongIdent ([string], [], [None])),
+                           LongIdent (SynLongIdent ([string], [], [None])),
+                           /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,21--3,37),
+                           { ArrowRange =
+                              /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,28--3,30) }),
+                        SynValInfo
+                          ([[SynArgInfo ([], false, None)]],
+                           SynArgInfo ([], false, None))),
+                     [Member
+                        (SynValSig
+                           ([], SynIdent (Invoke, None),
+                            SynValTyparDecls (None, true),
+                            Fun
+                              (LongIdent (SynLongIdent ([string], [], [None])),
+                               LongIdent (SynLongIdent ([string], [], [None])),
+                               /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,21--3,37),
+                               { ArrowRange =
+                                  /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,28--3,30) }),
+                            SynValInfo
+                              ([[SynArgInfo ([], false, None)]],
+                               SynArgInfo ([], false, None)), false, false,
+                            PreXmlDocEmpty, None, None,
+                            /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,9--3,37),
+                            { LeadingKeyword = Synthetic
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = Member },
+                         /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,9--3,37),
+                         { GetSetKeywords = None })],
+                     /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,9--3,37)),
+                  [],
+                  /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,5--3,37),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,7--3,8)
+                    WithKeyword = None })],
+              /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,0--3,37))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (1,0--3,37),
+          { LeadingKeyword =
+             Namespace
+               /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi b/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi
new file mode 100644
index 00000000000..47ce1274f74
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi
@@ -0,0 +1,5 @@
+namespace SomeNamespace
+
+type Shape =
+| Square of int 
+| Rectangle of int * int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
new file mode 100644
index 00000000000..5133eb737a4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -0,0 +1,78 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi",
+      QualifiedNameOfFile SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign,
+      [], [],
+      [SynModuleOrNamespaceSig
+         ([SomeNamespace], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Shape],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (3,5--3,10)),
+                  Simple
+                    (Union
+                       (None,
+                        [SynUnionCase
+                           ([], SynIdent (Square, None),
+                            Fields
+                              [SynField
+                                 ([], false, None,
+                                  LongIdent (SynLongIdent ([int], [], [None])),
+                                  false,
+                                  PreXmlDoc ((4,12), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,12--4,15),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,2--4,15),
+                            { BarRange =
+                               Some
+                                 /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,0--4,1) });
+                         SynUnionCase
+                           ([], SynIdent (Rectangle, None),
+                            Fields
+                              [SynField
+                                 ([], false, None,
+                                  LongIdent (SynLongIdent ([int], [], [None])),
+                                  false,
+                                  PreXmlDoc ((5,15), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,15--5,18),
+                                  { LeadingKeyword = None });
+                               SynField
+                                 ([], false, None,
+                                  LongIdent (SynLongIdent ([int], [], [None])),
+                                  false,
+                                  PreXmlDoc ((5,21), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,21--5,24),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,2--5,24),
+                            { BarRange =
+                               Some
+                                 /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,0--5,1) })],
+                        /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,0--5,24)),
+                     /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,0--5,24)),
+                  [],
+                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (3,5--5,24),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (3,11--3,12)
+                    WithKeyword = None })],
+              /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (3,0--5,24))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (1,0--5,24),
+          { LeadingKeyword =
+             Namespace
+               /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs
new file mode 100644
index 00000000000..385bb33f61c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs
@@ -0,0 +1,2 @@
+type Foo() =
+    abstract member Bar : int with get,set
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
new file mode 100644
index 00000000000..f07ffcbf1b5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -0,0 +1,84 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                         None,
+                         PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                         { AsKeyword = None });
+                      AbstractSlot
+                        (SynValSig
+                           ([], SynIdent (Bar, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,4--2,42),
+                            { LeadingKeyword =
+                               AbstractMember
+                                 (/root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,4--2,12),
+                                  /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,13--2,19))
+                              InlineKeyword = None
+                              WithKeyword =
+                               Some
+                                 /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,30--2,34)
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGetSet },
+                         /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,4--2,42),
+                         { GetSetKeywords =
+                            Some
+                              (GetSet
+                                 (/root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,35--2,38),
+                                  /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,39--2,42))) })],
+                     /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,4--2,42)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                        None,
+                        PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                        { AsKeyword = None })),
+                  /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,5--2,42),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,11--1,12)
+                    WithKeyword = None })],
+              /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,0--2,42))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,0--2,42),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs
new file mode 100644
index 00000000000..df3d7508bc4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs
@@ -0,0 +1,3 @@
+[<MyAttribute>]
+// noDoc
+type A = B
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
new file mode 100644
index 00000000000..5a57721b851
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
@@ -0,0 +1,50 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs", false,
+      QualifiedNameOfFile
+        SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([{ Attributes =
+                         [{ TypeName = SynLongIdent ([MyAttribute], [], [None])
+                            ArgExpr =
+                             Const
+                               (Unit,
+                                /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (1,2--1,13))
+                            Target = None
+                            AppliesToGetterAndSetter = false
+                            Range =
+                             /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (1,2--1,13) }]
+                        Range =
+                         /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (1,0--1,15) }],
+                     None, [], [A],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,5--3,6)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok, LongIdent (SynLongIdent ([B], [], [None])),
+                        /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,9--3,10)),
+                     /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,9--3,10)),
+                  [], None,
+                  /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (1,0--3,10),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,0--3,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,7--3,8)
+                    WithKeyword = None })],
+              /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (1,0--3,10))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (1,0--3,10),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--2,8)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs
new file mode 100644
index 00000000000..7dacaffe108
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs
@@ -0,0 +1,2 @@
+type Int32 with
+    member _.Zero = 0
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
new file mode 100644
index 00000000000..aa41f6abac0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -0,0 +1,68 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Int32],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,5--1,10)),
+                  ObjectModel
+                    (Augmentation
+                       /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,11--1,15),
+                     [],
+                     /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,5--2,21)),
+                  [Member
+                     (SynBinding
+                        (None, Normal, false, false, [],
+                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         SynValData
+                           (Some { IsInstance = true
+                                   IsDispatchSlot = false
+                                   IsOverrideOrExplicitImpl = false
+                                   IsFinal = false
+                                   GetterOrSetterIsCompilerGenerated = false
+                                   MemberKind = Member },
+                            SynValInfo
+                              ([[SynArgInfo ([], false, None)]; []],
+                               SynArgInfo ([], false, None)), None),
+                         LongIdent
+                           (SynLongIdent
+                              ([_; Zero],
+                               [/root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,12--2,13)],
+                               [None; None]), None, None, Pats [], None,
+                            /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,11--2,17)),
+                         None,
+                         Const
+                           (Int32 0,
+                            /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,20--2,21)),
+                         /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,11--2,17),
+                         NoneAtInvisible,
+                         { LeadingKeyword =
+                            Member
+                              /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,4--2,10)
+                           InlineKeyword = None
+                           EqualsRange =
+                            Some
+                              /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,18--2,19) }),
+                      /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,4--2,21))],
+                  None,
+                  /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,5--2,21),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                    EqualsRange = None
+                    WithKeyword = None })],
+              /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,0--2,21))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,0--2,21),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs
new file mode 100644
index 00000000000..55272890e2d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs
@@ -0,0 +1,4 @@
+/// mutable class with auto-properties
+type Person(name : string, age : int) =
+    /// Full name
+    member val Name = name with get, set
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..a9028bcdd07
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,107 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs",
+      false,
+      QualifiedNameOfFile
+        SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Person],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,5--2,11)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([Typed
+                               (Id
+                                  (name, None, false, false, false,
+                                   /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,12--2,16)),
+                                LongIdent (SynLongIdent ([string], [], [None])),
+                                /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,12--2,25));
+                             Typed
+                               (Id
+                                  (age, None, false, false, false,
+                                   /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,27--2,30)),
+                                LongIdent (SynLongIdent ([int], [], [None])),
+                                /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,27--2,36))],
+                            /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,11--2,37)),
+                         None,
+                         PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,5--2,11),
+                         { AsKeyword = None });
+                      AutoProperty
+                        ([], false, Name, None, PropertyGetSet,
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = Member },
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertySet },
+                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None, Ident name,
+                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,4--4,26),
+                         { LeadingKeyword =
+                            MemberVal
+                              (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,4--4,10),
+                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,11--4,14))
+                           WithKeyword =
+                            Some
+                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,27--4,31)
+                           EqualsRange =
+                            Some
+                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,20--4,21)
+                           GetSetKeywords =
+                            Some
+                              (GetSet
+                                 (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,32--4,35),
+                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,37--4,40))) })],
+                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,4--4,26)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([Typed
+                              (Id
+                                 (name, None, false, false, false,
+                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,12--2,16)),
+                               LongIdent (SynLongIdent ([string], [], [None])),
+                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,12--2,25));
+                            Typed
+                              (Id
+                                 (age, None, false, false, false,
+                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,27--2,30)),
+                               LongIdent (SynLongIdent ([int], [], [None])),
+                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,27--2,36))],
+                           /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,11--2,37)),
+                        None,
+                        PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,5--2,11),
+                        { AsKeyword = None })),
+                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (1,0--4,26),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,38--2,39)
+                    WithKeyword = None })],
+              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (1,0--4,26))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,0--4,40),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs
new file mode 100644
index 00000000000..65bae827ce9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs
@@ -0,0 +1,3 @@
+type Foo() =
+    member val AutoProperty = autoProp with get, set
+    member val AutoProperty2 = autoProp
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
new file mode 100644
index 00000000000..6e43759f9e0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -0,0 +1,111 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                         None,
+                         PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                         { AsKeyword = None });
+                      AutoProperty
+                        ([], false, AutoProperty, None, PropertyGetSet,
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = Member },
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertySet },
+                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None, Ident autoProp,
+                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,4--2,38),
+                         { LeadingKeyword =
+                            MemberVal
+                              (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,4--2,10),
+                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,11--2,14))
+                           WithKeyword =
+                            Some
+                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,39--2,43)
+                           EqualsRange =
+                            Some
+                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,28--2,29)
+                           GetSetKeywords =
+                            Some
+                              (GetSet
+                                 (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,44--2,47),
+                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,49--2,52))) });
+                      AutoProperty
+                        ([], false, AutoProperty2, None, Member,
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = Member },
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertySet },
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None, Ident autoProp,
+                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,4--3,39),
+                         { LeadingKeyword =
+                            MemberVal
+                              (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,4--3,10),
+                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,11--3,14))
+                           WithKeyword = None
+                           EqualsRange =
+                            Some
+                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,29--3,30)
+                           GetSetKeywords = None })],
+                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,4--3,39)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                        None,
+                        PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                        { AsKeyword = None })),
+                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,5--3,39),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,11--1,12)
+                    WithKeyword = None })],
+              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,0--3,39))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,0--3,39),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs
new file mode 100644
index 00000000000..4013b161636
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs
@@ -0,0 +1,3 @@
+type Bear =
+    | BlackBear = 1
+    | PolarBear = 2
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..089d79e3bdf
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,58 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs", false,
+      QualifiedNameOfFile SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign, [],
+      [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Bear],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (1,5--1,9)),
+                  Simple
+                    (Enum
+                       ([SynEnumCase
+                           ([], SynIdent (BlackBear, None),
+                            Const
+                              (Int32 1,
+                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,18--2,19)),
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,6--2,19),
+                            { BarRange =
+                               Some
+                                 /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,4--2,5)
+                              EqualsRange =
+                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,16--2,17) });
+                         SynEnumCase
+                           ([], SynIdent (PolarBear, None),
+                            Const
+                              (Int32 2,
+                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,18--3,19)),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,6--3,19),
+                            { BarRange =
+                               Some
+                                 /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,4--3,5)
+                              EqualsRange =
+                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,16--3,17) })],
+                        /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,4--3,19)),
+                     /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,4--3,19)),
+                  [], None,
+                  /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (1,5--3,19),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (1,10--1,11)
+                    WithKeyword = None })],
+              /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (1,0--3,19))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (1,0--3,19),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs
new file mode 100644
index 00000000000..a34936ddb24
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs
@@ -0,0 +1,3 @@
+type A =
+    /// B
+    member x.B with get() = 5
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
new file mode 100644
index 00000000000..2d13c6c309a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
@@ -0,0 +1,84 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithMemberWithGetHasXmlComment.fs", false,
+      QualifiedNameOfFile SynTypeDefnWithMemberWithGetHasXmlComment, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithMemberWithGetHasXmlComment], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [A],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [GetSetMember
+                        (Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertyGet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)]; []],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([x; B],
+                                     [/root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,12--3,13)],
+                                     [None; None]), Some get, None,
+                                  Pats
+                                    [Paren
+                                       (Const
+                                          (Unit,
+                                           /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,23--3,25)),
+                                        /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,23--3,25))],
+                                  None,
+                                  /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,20--3,25)),
+                               None,
+                               Const
+                                 (Int32 5,
+                                  /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,28--3,29)),
+                               /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,4--3,25),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,4--3,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,26--3,27) })),
+                         None,
+                         /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,4--3,29),
+                         { InlineKeyword = None
+                           WithKeyword =
+                            /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,15--3,19)
+                           GetKeyword =
+                            Some
+                              /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,20--3,23)
+                           AndKeyword = None
+                           SetKeyword = None })],
+                     /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,4--3,29)),
+                  [], None,
+                  /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (1,5--3,29),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (1,0--3,29))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (1,0--3,29),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs
new file mode 100644
index 00000000000..1fc8a02804f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs
@@ -0,0 +1,2 @@
+type A() =
+    member this.Z with set (_:int):unit = () and get():int = 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs.bsl
new file mode 100644
index 00000000000..c8ef5a47c35
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs.bsl
@@ -0,0 +1,171 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithMemberWithSetget.fs", false,
+      QualifiedNameOfFile SynTypeDefnWithMemberWithSetget, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithMemberWithSetget], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [A],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithMemberWithSetget.fs (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/SynTypeDefnWithMemberWithSetget.fs (1,6--1,8)),
+                         None,
+                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynTypeDefnWithMemberWithSetget.fs (1,5--1,6),
+                         { AsKeyword = None });
+                      GetSetMember
+                        (Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertyGet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)]; []],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([this; Z],
+                                     [/root/SynTypeDefnWithMemberWithSetget.fs (2,15--2,16)],
+                                     [None; None]), Some get, None,
+                                  Pats
+                                    [Paren
+                                       (Const
+                                          (Unit,
+                                           /root/SynTypeDefnWithMemberWithSetget.fs (2,52--2,54)),
+                                        /root/SynTypeDefnWithMemberWithSetget.fs (2,52--2,54))],
+                                  None,
+                                  /root/SynTypeDefnWithMemberWithSetget.fs (2,49--2,54)),
+                               Some
+                                 (SynBindingReturnInfo
+                                    (LongIdent
+                                       (SynLongIdent ([int], [], [None])),
+                                     /root/SynTypeDefnWithMemberWithSetget.fs (2,55--2,58),
+                                     [],
+                                     { ColonRange =
+                                        Some
+                                          /root/SynTypeDefnWithMemberWithSetget.fs (2,54--2,55) })),
+                               Typed
+                                 (Const
+                                    (Int32 1,
+                                     /root/SynTypeDefnWithMemberWithSetget.fs (2,61--2,62)),
+                                  LongIdent (SynLongIdent ([int], [], [None])),
+                                  /root/SynTypeDefnWithMemberWithSetget.fs (2,61--2,62)),
+                               /root/SynTypeDefnWithMemberWithSetget.fs (2,49--2,54),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/SynTypeDefnWithMemberWithSetget.fs (2,4--2,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/SynTypeDefnWithMemberWithSetget.fs (2,59--2,60) })),
+                         Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertySet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)];
+                                      [SynArgInfo ([], false, None)]],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([this; Z],
+                                     [/root/SynTypeDefnWithMemberWithSetget.fs (2,15--2,16)],
+                                     [None; None]), Some set, None,
+                                  Pats
+                                    [Paren
+                                       (Typed
+                                          (Wild
+                                             /root/SynTypeDefnWithMemberWithSetget.fs (2,28--2,29),
+                                           LongIdent
+                                             (SynLongIdent ([int], [], [None])),
+                                           /root/SynTypeDefnWithMemberWithSetget.fs (2,28--2,33)),
+                                        /root/SynTypeDefnWithMemberWithSetget.fs (2,27--2,34))],
+                                  None,
+                                  /root/SynTypeDefnWithMemberWithSetget.fs (2,23--2,34)),
+                               Some
+                                 (SynBindingReturnInfo
+                                    (LongIdent
+                                       (SynLongIdent ([unit], [], [None])),
+                                     /root/SynTypeDefnWithMemberWithSetget.fs (2,35--2,39),
+                                     [],
+                                     { ColonRange =
+                                        Some
+                                          /root/SynTypeDefnWithMemberWithSetget.fs (2,34--2,35) })),
+                               Typed
+                                 (Const
+                                    (Unit,
+                                     /root/SynTypeDefnWithMemberWithSetget.fs (2,42--2,44)),
+                                  LongIdent (SynLongIdent ([unit], [], [None])),
+                                  /root/SynTypeDefnWithMemberWithSetget.fs (2,42--2,44)),
+                               /root/SynTypeDefnWithMemberWithSetget.fs (2,23--2,34),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/SynTypeDefnWithMemberWithSetget.fs (2,4--2,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/SynTypeDefnWithMemberWithSetget.fs (2,40--2,41) })),
+                         /root/SynTypeDefnWithMemberWithSetget.fs (2,4--2,62),
+                         { InlineKeyword = None
+                           WithKeyword =
+                            /root/SynTypeDefnWithMemberWithSetget.fs (2,18--2,22)
+                           GetKeyword =
+                            Some
+                              /root/SynTypeDefnWithMemberWithSetget.fs (2,49--2,52)
+                           AndKeyword =
+                            Some
+                              /root/SynTypeDefnWithMemberWithSetget.fs (2,45--2,48)
+                           SetKeyword =
+                            Some
+                              /root/SynTypeDefnWithMemberWithSetget.fs (2,23--2,26) })],
+                     /root/SynTypeDefnWithMemberWithSetget.fs (2,4--2,62)), [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/SynTypeDefnWithMemberWithSetget.fs (1,6--1,8)),
+                        None,
+                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynTypeDefnWithMemberWithSetget.fs (1,5--1,6),
+                        { AsKeyword = None })),
+                  /root/SynTypeDefnWithMemberWithSetget.fs (1,5--2,62),
+                  { LeadingKeyword =
+                     Type /root/SynTypeDefnWithMemberWithSetget.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/SynTypeDefnWithMemberWithSetget.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/SynTypeDefnWithMemberWithSetget.fs (1,0--2,62))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithMemberWithSetget.fs (1,0--2,62),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs
new file mode 100644
index 00000000000..78b0a64be18
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs
@@ -0,0 +1,3 @@
+type Foobar () =
+    class
+    end
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..2e0537c6a72
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,53 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs",
+      false,
+      QualifiedNameOfFile
+        SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign],
+          false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foobar],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,5--1,11)),
+                  ObjectModel
+                    (Class,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,12--1,14)),
+                         None,
+                         PreXmlDoc ((1,12), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,5--1,11),
+                         { AsKeyword = None })],
+                     /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,4--3,7)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,12--1,14)),
+                        None,
+                        PreXmlDoc ((1,12), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,5--1,11),
+                        { AsKeyword = None })),
+                  /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,5--3,7),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,15--1,16)
+                    WithKeyword = None })],
+              /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,0--3,7))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,0--3,7),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs
new file mode 100644
index 00000000000..b9036b34530
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs
@@ -0,0 +1 @@
+type X = delegate of string -> string
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..d8987408ffe
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,71 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs",
+      false,
+      QualifiedNameOfFile
+        SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign, [],
+      [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign],
+          false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,5--1,6)),
+                  ObjectModel
+                    (Delegate
+                       (Fun
+                          (LongIdent (SynLongIdent ([string], [], [None])),
+                           LongIdent (SynLongIdent ([string], [], [None])),
+                           /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,21--1,37),
+                           { ArrowRange =
+                              /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,28--1,30) }),
+                        SynValInfo
+                          ([[SynArgInfo ([], false, None)]],
+                           SynArgInfo ([], false, None))),
+                     [AbstractSlot
+                        (SynValSig
+                           ([], SynIdent (Invoke, None),
+                            SynValTyparDecls (None, true),
+                            Fun
+                              (LongIdent (SynLongIdent ([string], [], [None])),
+                               LongIdent (SynLongIdent ([string], [], [None])),
+                               /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,21--1,37),
+                               { ArrowRange =
+                                  /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,28--1,30) }),
+                            SynValInfo
+                              ([[SynArgInfo ([], false, None)]],
+                               SynArgInfo ([], false, None)), false, false,
+                            PreXmlDocEmpty, None, None,
+                            /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,9--1,37),
+                            { LeadingKeyword = Synthetic
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = true
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = Member },
+                         /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,9--1,37),
+                         { GetSetKeywords = None })],
+                     /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,9--1,37)),
+                  [], None,
+                  /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,5--1,37),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,0--1,37))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,0--1,37),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs
new file mode 100644
index 00000000000..766eb008203
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs
@@ -0,0 +1,4 @@
+type Foo =
+    { Bar : int }
+    with
+        member this.Meh (v:int) = this.Bar + v
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
new file mode 100644
index 00000000000..3d972a4fe73
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -0,0 +1,107 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs", false,
+      QualifiedNameOfFile SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                  Simple
+                    (Record
+                       (None,
+                        [SynField
+                           ([], false, Some Bar,
+                            LongIdent (SynLongIdent ([int], [], [None])), false,
+                            PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,6--2,15),
+                            { LeadingKeyword = None })],
+                        /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,4--2,17)),
+                     /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,4--2,17)),
+                  [Member
+                     (SynBinding
+                        (None, Normal, false, false, [],
+                         PreXmlDoc ((4,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         SynValData
+                           (Some { IsInstance = true
+                                   IsDispatchSlot = false
+                                   IsOverrideOrExplicitImpl = false
+                                   IsFinal = false
+                                   GetterOrSetterIsCompilerGenerated = false
+                                   MemberKind = Member },
+                            SynValInfo
+                              ([[SynArgInfo ([], false, None)];
+                                [SynArgInfo ([], false, Some v)]],
+                               SynArgInfo ([], false, None)), None),
+                         LongIdent
+                           (SynLongIdent
+                              ([this; Meh],
+                               [/root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,19--4,20)],
+                               [None; None]), None, None,
+                            Pats
+                              [Paren
+                                 (Typed
+                                    (Named
+                                       (SynIdent (v, None), false, None,
+                                        /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,25--4,26)),
+                                     LongIdent
+                                       (SynLongIdent ([int], [], [None])),
+                                     /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,25--4,30)),
+                                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,24--4,31))],
+                            None,
+                            /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,15--4,31)),
+                         None,
+                         App
+                           (NonAtomic, false,
+                            App
+                              (NonAtomic, true,
+                               LongIdent
+                                 (false,
+                                  SynLongIdent
+                                    ([op_Addition], [],
+                                     [Some (OriginalNotation "+")]), None,
+                                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,43--4,44)),
+                               LongIdent
+                                 (false,
+                                  SynLongIdent
+                                    ([this; Bar],
+                                     [/root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,38--4,39)],
+                                     [None; None]), None,
+                                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,34--4,42)),
+                               /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,34--4,44)),
+                            Ident v,
+                            /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,34--4,46)),
+                         /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,15--4,31),
+                         NoneAtInvisible,
+                         { LeadingKeyword =
+                            Member
+                              /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,8--4,14)
+                           InlineKeyword = None
+                           EqualsRange =
+                            Some
+                              /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,32--4,33) }),
+                      /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,8--4,46))],
+                  None,
+                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (1,5--4,46),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (1,9--1,10)
+                    WithKeyword =
+                     Some
+                       /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (3,4--3,8) })],
+              /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (1,0--4,46))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (1,0--4,46),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs
new file mode 100644
index 00000000000..eab4128caa9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs
@@ -0,0 +1,4 @@
+type Foo =
+    static member ReadWrite2 
+        with set  x = lastUsed <- ("ReadWrite2", x)
+        and  get () = lastUsed <- ("ReadWrite2", 0); 4
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
new file mode 100644
index 00000000000..63710bdcf9f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
@@ -0,0 +1,162 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithStaticMemberWithGetset.fs", false,
+      QualifiedNameOfFile SynTypeDefnWithStaticMemberWithGetset, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithStaticMemberWithGetset], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (1,5--1,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [GetSetMember
+                        (Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = false
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertyGet },
+                                  SynValInfo
+                                    ([[]], SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent ([ReadWrite2], [], [None]),
+                                  Some get, None,
+                                  Pats
+                                    [Paren
+                                       (Const
+                                          (Unit,
+                                           /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,17--4,19)),
+                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,17--4,19))],
+                                  None,
+                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,19)),
+                               None,
+                               Sequential
+                                 (SuppressNeither, true,
+                                  LongIdentSet
+                                    (SynLongIdent ([lastUsed], [], [None]),
+                                     Paren
+                                       (Tuple
+                                          (false,
+                                           [Const
+                                              (String
+                                                 ("ReadWrite2", Regular,
+                                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,47)),
+                                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,47));
+                                            Const
+                                              (Int32 0,
+                                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,49--4,50))],
+                                           [/root/SynTypeDefnWithStaticMemberWithGetset.fs (4,47--4,48)],
+                                           /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,50)),
+                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,34--4,35),
+                                        Some
+                                          /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,50--4,51),
+                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,34--4,51)),
+                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,22--4,51)),
+                                  Const
+                                    (Int32 4,
+                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,53--4,54)),
+                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,22--4,54)),
+                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,19),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  StaticMember
+                                    (/root/SynTypeDefnWithStaticMemberWithGetset.fs (2,4--2,10),
+                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,11--2,17))
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,20--4,21) })),
+                         Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = false
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertySet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, Some x)]],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent ([ReadWrite2], [], [None]),
+                                  Some set, None,
+                                  Pats
+                                    [Named
+                                       (SynIdent (x, None), false, None,
+                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,18--3,19))],
+                                  None,
+                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,13--3,19)),
+                               None,
+                               LongIdentSet
+                                 (SynLongIdent ([lastUsed], [], [None]),
+                                  Paren
+                                    (Tuple
+                                       (false,
+                                        [Const
+                                           (String
+                                              ("ReadWrite2", Regular,
+                                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,35--3,47)),
+                                            /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,35--3,47));
+                                         Ident x],
+                                        [/root/SynTypeDefnWithStaticMemberWithGetset.fs (3,47--3,48)],
+                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,35--3,50)),
+                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,34--3,35),
+                                     Some
+                                       /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,50--3,51),
+                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,34--3,51)),
+                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,22--3,51)),
+                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,13--3,19),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  StaticMember
+                                    (/root/SynTypeDefnWithStaticMemberWithGetset.fs (2,4--2,10),
+                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,11--2,17))
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,20--3,21) })),
+                         /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,4--4,54),
+                         { InlineKeyword = None
+                           WithKeyword =
+                            /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,8--3,12)
+                           GetKeyword =
+                            Some
+                              /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,16)
+                           AndKeyword =
+                            Some
+                              /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,8--4,11)
+                           SetKeyword =
+                            Some
+                              /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,13--3,16) })],
+                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,4--4,54)),
+                  [], None,
+                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (1,5--4,54),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnWithStaticMemberWithGetset.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnWithStaticMemberWithGetset.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/SynTypeDefnWithStaticMemberWithGetset.fs (1,0--4,54))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithStaticMemberWithGetset.fs (1,0--4,54),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs
new file mode 100644
index 00000000000..f3a8d261e8f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs
@@ -0,0 +1,3 @@
+type Shape =
+    | Square of int 
+    | Rectangle of int * int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..28ef63a62a7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,77 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs", false,
+      QualifiedNameOfFile SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Shape],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (1,5--1,10)),
+                  Simple
+                    (Union
+                       (None,
+                        [SynUnionCase
+                           ([], SynIdent (Square, None),
+                            Fields
+                              [SynField
+                                 ([], false, None,
+                                  LongIdent (SynLongIdent ([int], [], [None])),
+                                  false,
+                                  PreXmlDoc ((2,16), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,16--2,19),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,6--2,19),
+                            { BarRange =
+                               Some
+                                 /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,4--2,5) });
+                         SynUnionCase
+                           ([], SynIdent (Rectangle, None),
+                            Fields
+                              [SynField
+                                 ([], false, None,
+                                  LongIdent (SynLongIdent ([int], [], [None])),
+                                  false,
+                                  PreXmlDoc ((3,19), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,19--3,22),
+                                  { LeadingKeyword = None });
+                               SynField
+                                 ([], false, None,
+                                  LongIdent (SynLongIdent ([int], [], [None])),
+                                  false,
+                                  PreXmlDoc ((3,25), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,25--3,28),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,6--3,28),
+                            { BarRange =
+                               Some
+                                 /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,4--3,5) })],
+                        /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,4--3,28)),
+                     /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,4--3,28)),
+                  [], None,
+                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (1,5--3,28),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (1,11--1,12)
+                    WithKeyword = None })],
+              /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (1,0--3,28))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (1,0--3,28),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs
new file mode 100644
index 00000000000..e5a2833cf93
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs
@@ -0,0 +1,4 @@
+/// Doc
+// noDoc
+type A = B
+and C = D
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
new file mode 100644
index 00000000000..cf7d5fabaa9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
@@ -0,0 +1,58 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs", false,
+      QualifiedNameOfFile SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [A],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,5--3,6)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok, LongIdent (SynLongIdent ([B], [], [None])),
+                        /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,9--3,10)),
+                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,9--3,10)),
+                  [], None,
+                  /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (1,0--3,10),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,0--3,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,7--3,8)
+                    WithKeyword = None });
+               SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [C],
+                     PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,4--4,5)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok, LongIdent (SynLongIdent ([D], [], [None])),
+                        /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,8--4,9)),
+                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,8--4,9)),
+                  [], None,
+                  /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,4--4,9),
+                  { LeadingKeyword =
+                     And
+                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,0--4,3)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,6--4,7)
+                    WithKeyword = None })],
+              /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (1,0--4,9))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,0--4,9),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (2,0--2,8)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs b/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs
new file mode 100644
index 00000000000..1b2df9575a8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs
@@ -0,0 +1,2 @@
+type X = string -> // after a tuple, mixed needs an indent 
+                 int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs.bsl b/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs.bsl
new file mode 100644
index 00000000000..e9c7c3480eb
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs.bsl
@@ -0,0 +1,35 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeFunHasRangeOfArrow.fs", false,
+      QualifiedNameOfFile SynTypeFunHasRangeOfArrow, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeFunHasRangeOfArrow], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/SynTypeFunHasRangeOfArrow.fs (1,5--1,6)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok,
+                        Fun
+                          (LongIdent (SynLongIdent ([string], [], [None])),
+                           LongIdent (SynLongIdent ([int], [], [None])),
+                           /root/SynTypeFunHasRangeOfArrow.fs (1,9--2,20),
+                           { ArrowRange =
+                              /root/SynTypeFunHasRangeOfArrow.fs (1,16--1,18) }),
+                        /root/SynTypeFunHasRangeOfArrow.fs (1,9--2,20)),
+                     /root/SynTypeFunHasRangeOfArrow.fs (1,9--2,20)), [], None,
+                  /root/SynTypeFunHasRangeOfArrow.fs (1,5--2,20),
+                  { LeadingKeyword =
+                     Type /root/SynTypeFunHasRangeOfArrow.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/SynTypeFunHasRangeOfArrow.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/SynTypeFunHasRangeOfArrow.fs (1,0--2,20))], PreXmlDocEmpty,
+          [], None, /root/SynTypeFunHasRangeOfArrow.fs (1,0--2,20),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/SynTypeFunHasRangeOfArrow.fs (1,19--1,59)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs b/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs
new file mode 100644
index 00000000000..022a3808958
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs
@@ -0,0 +1 @@
+let inline (!!) (x: ^a) : ^b = ((^a or ^b): (static member op_Implicit: ^a -> ^b) x)
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs.bsl
new file mode 100644
index 00000000000..d672af35da5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs.bsl
@@ -0,0 +1,120 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeOrInsideSynExprTraitCall.fs", false,
+      QualifiedNameOfFile SynTypeOrInsideSynExprTraitCall, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeOrInsideSynExprTraitCall], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, true, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some x)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent
+                       ([op_BangBang], [],
+                        [Some
+                           (OriginalNotationWithParen
+                              (/root/SynTypeOrInsideSynExprTraitCall.fs (1,11--1,12),
+                               "!!",
+                               /root/SynTypeOrInsideSynExprTraitCall.fs (1,14--1,15)))]),
+                     None, None,
+                     Pats
+                       [Paren
+                          (Typed
+                             (Named
+                                (SynIdent (x, None), false, None,
+                                 /root/SynTypeOrInsideSynExprTraitCall.fs (1,17--1,18)),
+                              Var
+                                (SynTypar (a, HeadType, false),
+                                 /root/SynTypeOrInsideSynExprTraitCall.fs (1,20--1,22)),
+                              /root/SynTypeOrInsideSynExprTraitCall.fs (1,17--1,22)),
+                           /root/SynTypeOrInsideSynExprTraitCall.fs (1,16--1,23))],
+                     None, /root/SynTypeOrInsideSynExprTraitCall.fs (1,11--1,23)),
+                  Some
+                    (SynBindingReturnInfo
+                       (Var
+                          (SynTypar (b, HeadType, false),
+                           /root/SynTypeOrInsideSynExprTraitCall.fs (1,26--1,28)),
+                        /root/SynTypeOrInsideSynExprTraitCall.fs (1,26--1,28),
+                        [],
+                        { ColonRange =
+                           Some
+                             /root/SynTypeOrInsideSynExprTraitCall.fs (1,24--1,25) })),
+                  Typed
+                    (Paren
+                       (TraitCall
+                          (Paren
+                             (Or
+                                (Var
+                                   (SynTypar (a, HeadType, false),
+                                    /root/SynTypeOrInsideSynExprTraitCall.fs (1,33--1,35)),
+                                 Var
+                                   (SynTypar (b, HeadType, false),
+                                    /root/SynTypeOrInsideSynExprTraitCall.fs (1,39--1,41)),
+                                 /root/SynTypeOrInsideSynExprTraitCall.fs (1,33--1,41),
+                                 { OrKeyword =
+                                    /root/SynTypeOrInsideSynExprTraitCall.fs (1,36--1,38) }),
+                              /root/SynTypeOrInsideSynExprTraitCall.fs (1,32--1,42)),
+                           Member
+                             (SynValSig
+                                ([], SynIdent (op_Implicit, None),
+                                 SynValTyparDecls (None, true),
+                                 Fun
+                                   (Var
+                                      (SynTypar (a, HeadType, false),
+                                       /root/SynTypeOrInsideSynExprTraitCall.fs (1,72--1,74)),
+                                    Var
+                                      (SynTypar (b, HeadType, false),
+                                       /root/SynTypeOrInsideSynExprTraitCall.fs (1,78--1,80)),
+                                    /root/SynTypeOrInsideSynExprTraitCall.fs (1,72--1,80),
+                                    { ArrowRange =
+                                       /root/SynTypeOrInsideSynExprTraitCall.fs (1,75--1,77) }),
+                                 SynValInfo
+                                   ([[SynArgInfo ([], false, None)]],
+                                    SynArgInfo ([], false, None)), false, false,
+                                 PreXmlDoc ((1,45), FSharp.Compiler.Xml.XmlDocCollector),
+                                 None, None,
+                                 /root/SynTypeOrInsideSynExprTraitCall.fs (1,45--1,80),
+                                 { LeadingKeyword =
+                                    StaticMember
+                                      (/root/SynTypeOrInsideSynExprTraitCall.fs (1,45--1,51),
+                                       /root/SynTypeOrInsideSynExprTraitCall.fs (1,52--1,58))
+                                   InlineKeyword = None
+                                   WithKeyword = None
+                                   EqualsRange = None }),
+                              { IsInstance = false
+                                IsDispatchSlot = false
+                                IsOverrideOrExplicitImpl = false
+                                IsFinal = false
+                                GetterOrSetterIsCompilerGenerated = false
+                                MemberKind = Member },
+                              /root/SynTypeOrInsideSynExprTraitCall.fs (1,45--1,80),
+                              { GetSetKeywords = None }), Ident x,
+                           /root/SynTypeOrInsideSynExprTraitCall.fs (1,31--1,84)),
+                        /root/SynTypeOrInsideSynExprTraitCall.fs (1,31--1,32),
+                        Some
+                          /root/SynTypeOrInsideSynExprTraitCall.fs (1,83--1,84),
+                        /root/SynTypeOrInsideSynExprTraitCall.fs (1,31--1,84)),
+                     Var
+                       (SynTypar (b, HeadType, false),
+                        /root/SynTypeOrInsideSynExprTraitCall.fs (1,26--1,28)),
+                     /root/SynTypeOrInsideSynExprTraitCall.fs (1,31--1,84)),
+                  /root/SynTypeOrInsideSynExprTraitCall.fs (1,11--1,23),
+                  NoneAtLet,
+                  { LeadingKeyword =
+                     Let /root/SynTypeOrInsideSynExprTraitCall.fs (1,0--1,3)
+                    InlineKeyword =
+                     Some /root/SynTypeOrInsideSynExprTraitCall.fs (1,4--1,10)
+                    EqualsRange =
+                     Some /root/SynTypeOrInsideSynExprTraitCall.fs (1,29--1,30) })],
+              /root/SynTypeOrInsideSynExprTraitCall.fs (1,0--1,84))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeOrInsideSynExprTraitCall.fs (1,0--1,84),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs b/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs
new file mode 100644
index 00000000000..cedd590ee53
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs
@@ -0,0 +1,2 @@
+let inline f_StaticMethod<'T1, 'T2 when ('T1 or 'T2) : (static member StaticMethod: int -> int) >() : int = 
+    ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl b/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
new file mode 100644
index 00000000000..0b36b6556d9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
@@ -0,0 +1,115 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs", false,
+      QualifiedNameOfFile
+        SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember], false,
+          AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, true, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([f_StaticMethod], [], [None]), None,
+                     Some
+                       (SynValTyparDecls
+                          (Some
+                             (PostfixList
+                                ([SynTyparDecl ([], SynTypar (T1, None, false));
+                                  SynTyparDecl ([], SynTypar (T2, None, false))],
+                                 [WhereTyparSupportsMember
+                                    (Paren
+                                       (Or
+                                          (Var
+                                             (SynTypar (T1, None, false),
+                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,41--1,44)),
+                                           Var
+                                             (SynTypar (T2, None, false),
+                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,48--1,51)),
+                                           /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,41--1,51),
+                                           { OrKeyword =
+                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,45--1,47) }),
+                                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,40--1,52)),
+                                     Member
+                                       (SynValSig
+                                          ([], SynIdent (StaticMethod, None),
+                                           SynValTyparDecls (None, true),
+                                           Fun
+                                             (LongIdent
+                                                (SynLongIdent
+                                                   ([int], [], [None])),
+                                              LongIdent
+                                                (SynLongIdent
+                                                   ([int], [], [None])),
+                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,84--1,94),
+                                              { ArrowRange =
+                                                 /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,88--1,90) }),
+                                           SynValInfo
+                                             ([[SynArgInfo ([], false, None)]],
+                                              SynArgInfo ([], false, None)),
+                                           false, false,
+                                           PreXmlDoc ((1,56), FSharp.Compiler.Xml.XmlDocCollector),
+                                           None, None,
+                                           /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,56--1,94),
+                                           { LeadingKeyword =
+                                              StaticMember
+                                                (/root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,56--1,62),
+                                                 /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,63--1,69))
+                                             InlineKeyword = None
+                                             WithKeyword = None
+                                             EqualsRange = None }),
+                                        { IsInstance = false
+                                          IsDispatchSlot = false
+                                          IsOverrideOrExplicitImpl = false
+                                          IsFinal = false
+                                          GetterOrSetterIsCompilerGenerated =
+                                           false
+                                          MemberKind = Member },
+                                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,56--1,94),
+                                        { GetSetKeywords = None }),
+                                     /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,40--1,95))],
+                                 /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,25--1,97))),
+                           false)),
+                     Pats
+                       [Paren
+                          (Const
+                             (Unit,
+                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,97--1,99)),
+                           /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,97--1,99))],
+                     None,
+                     /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,11--1,99)),
+                  Some
+                    (SynBindingReturnInfo
+                       (LongIdent (SynLongIdent ([int], [], [None])),
+                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,102--1,105),
+                        [],
+                        { ColonRange =
+                           Some
+                             /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,100--1,101) })),
+                  Typed
+                    (Const
+                       (Unit,
+                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,4--2,6)),
+                     LongIdent (SynLongIdent ([int], [], [None])),
+                     /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,4--2,6)),
+                  /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,11--1,99),
+                  NoneAtLet,
+                  { LeadingKeyword =
+                     Let
+                       /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,0--1,3)
+                    InlineKeyword =
+                     Some
+                       /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,4--1,10)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,106--1,107) })],
+              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,0--2,6))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,0--2,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs b/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs
new file mode 100644
index 00000000000..b5f12bcdeaa
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs
@@ -0,0 +1 @@
+let inline f (x: 'T) = ((^T or int) : (static member A: int) ())
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl b/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
new file mode 100644
index 00000000000..544bb79273a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
@@ -0,0 +1,94 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeOrWithAppTypeOnTheRightHandSide.fs", false,
+      QualifiedNameOfFile SynTypeOrWithAppTypeOnTheRightHandSide, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeOrWithAppTypeOnTheRightHandSide], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, true, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some x)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([f], [], [None]), None, None,
+                     Pats
+                       [Paren
+                          (Typed
+                             (Named
+                                (SynIdent (x, None), false, None,
+                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,14--1,15)),
+                              Var
+                                (SynTypar (T, None, false),
+                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,17--1,19)),
+                              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,14--1,19)),
+                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,13--1,20))],
+                     None,
+                     /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,11--1,20)),
+                  None,
+                  Paren
+                    (TraitCall
+                       (Paren
+                          (Or
+                             (Var
+                                (SynTypar (T, HeadType, false),
+                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,25--1,27)),
+                              LongIdent (SynLongIdent ([int], [], [None])),
+                              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,25--1,34),
+                              { OrKeyword =
+                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,28--1,30) }),
+                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,24--1,35)),
+                        Member
+                          (SynValSig
+                             ([], SynIdent (A, None),
+                              SynValTyparDecls (None, true),
+                              LongIdent (SynLongIdent ([int], [], [None])),
+                              SynValInfo ([], SynArgInfo ([], false, None)),
+                              false, false,
+                              PreXmlDoc ((1,39), FSharp.Compiler.Xml.XmlDocCollector),
+                              None, None,
+                              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,39--1,59),
+                              { LeadingKeyword =
+                                 StaticMember
+                                   (/root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,39--1,45),
+                                    /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,46--1,52))
+                                InlineKeyword = None
+                                WithKeyword = None
+                                EqualsRange = None }),
+                           { IsInstance = false
+                             IsDispatchSlot = false
+                             IsOverrideOrExplicitImpl = false
+                             IsFinal = false
+                             GetterOrSetterIsCompilerGenerated = false
+                             MemberKind = PropertyGet },
+                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,39--1,59),
+                           { GetSetKeywords = None }),
+                        Const
+                          (Unit,
+                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,61--1,63)),
+                        /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,23--1,64)),
+                     /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,23--1,24),
+                     Some
+                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,63--1,64),
+                     /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,23--1,64)),
+                  /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,11--1,20),
+                  NoneAtLet,
+                  { LeadingKeyword =
+                     Let
+                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,0--1,3)
+                    InlineKeyword =
+                     Some
+                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,4--1,10)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,21--1,22) })],
+              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,0--1,64))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,0--1,64),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi
new file mode 100644
index 00000000000..672fc8e01a5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi
@@ -0,0 +1,2 @@
+type T =
+    member M: [<SomeAttribute>] a * [<OtherAttribute>] b -> int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
new file mode 100644
index 00000000000..db6542b8b42
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
@@ -0,0 +1,136 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi",
+      QualifiedNameOfFile SynTypeTupleDoesIncludeLeadingParameterAttributes, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([SynTypeTupleDoesIncludeLeadingParameterAttributes], false, AnonModule,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [T],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynValSig
+                           ([], SynIdent (M, None),
+                            SynValTyparDecls (None, true),
+                            Fun
+                              (Tuple
+                                 (false,
+                                  [Type
+                                     (SignatureParameter
+                                        ([{ Attributes =
+                                             [{ TypeName =
+                                                 SynLongIdent
+                                                   ([SomeAttribute], [], [None])
+                                                ArgExpr =
+                                                 Const
+                                                   (Unit,
+                                                    /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,16--2,29))
+                                                Target = None
+                                                AppliesToGetterAndSetter = false
+                                                Range =
+                                                 /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,16--2,29) }]
+                                            Range =
+                                             /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,14--2,31) }],
+                                         false, None,
+                                         LongIdent
+                                           (SynLongIdent ([a], [], [None])),
+                                         /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,14--2,33)));
+                                   Star
+                                     /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,34--2,35);
+                                   Type
+                                     (SignatureParameter
+                                        ([{ Attributes =
+                                             [{ TypeName =
+                                                 SynLongIdent
+                                                   ([OtherAttribute], [], [None])
+                                                ArgExpr =
+                                                 Const
+                                                   (Unit,
+                                                    /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,38--2,52))
+                                                Target = None
+                                                AppliesToGetterAndSetter = false
+                                                Range =
+                                                 /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,38--2,52) }]
+                                            Range =
+                                             /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,36--2,54) }],
+                                         false, None,
+                                         LongIdent
+                                           (SynLongIdent ([b], [], [None])),
+                                         /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,36--2,56)))],
+                                  /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,14--2,56)),
+                               LongIdent (SynLongIdent ([int], [], [None])),
+                               /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,14--2,63),
+                               { ArrowRange =
+                                  /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,57--2,59) }),
+                            SynValInfo
+                              ([[SynArgInfo
+                                   ([{ Attributes =
+                                        [{ TypeName =
+                                            SynLongIdent
+                                              ([SomeAttribute], [], [None])
+                                           ArgExpr =
+                                            Const
+                                              (Unit,
+                                               /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,16--2,29))
+                                           Target = None
+                                           AppliesToGetterAndSetter = false
+                                           Range =
+                                            /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,16--2,29) }]
+                                       Range =
+                                        /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,14--2,31) }],
+                                    false, None);
+                                 SynArgInfo
+                                   ([{ Attributes =
+                                        [{ TypeName =
+                                            SynLongIdent
+                                              ([OtherAttribute], [], [None])
+                                           ArgExpr =
+                                            Const
+                                              (Unit,
+                                               /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,38--2,52))
+                                           Target = None
+                                           AppliesToGetterAndSetter = false
+                                           Range =
+                                            /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,38--2,52) }]
+                                       Range =
+                                        /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,36--2,54) }],
+                                    false, None)]], SynArgInfo ([], false, None)),
+                            false, false,
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,4--2,63),
+                            { LeadingKeyword =
+                               Member
+                                 /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,4--2,10)
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = Member },
+                         /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,4--2,63),
+                         { GetSetKeywords = None })],
+                     /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,4--2,63)),
+                  [],
+                  /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (1,5--2,63),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (1,7--1,8)
+                    WithKeyword = None })],
+              /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (1,0--2,63))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (1,0--2,63),
+          { LeadingKeyword = None })], { ConditionalDirectives = []
+                                         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi
new file mode 100644
index 00000000000..a86030c46a0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi
@@ -0,0 +1,2 @@
+type T =
+    member M: p1: a * p2: b -> int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
new file mode 100644
index 00000000000..ee04489da46
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
@@ -0,0 +1,77 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SynTypeTupleDoesIncludeLeadingParameterName.fsi",
+      QualifiedNameOfFile SynTypeTupleDoesIncludeLeadingParameterName, [], [],
+      [SynModuleOrNamespaceSig
+         ([SynTypeTupleDoesIncludeLeadingParameterName], false, AnonModule,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [T],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (1,5--1,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynValSig
+                           ([], SynIdent (M, None),
+                            SynValTyparDecls (None, true),
+                            Fun
+                              (Tuple
+                                 (false,
+                                  [Type
+                                     (SignatureParameter
+                                        ([], false, Some p1,
+                                         LongIdent
+                                           (SynLongIdent ([a], [], [None])),
+                                         /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,14--2,19)));
+                                   Star
+                                     /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,20--2,21);
+                                   Type
+                                     (SignatureParameter
+                                        ([], false, Some p2,
+                                         LongIdent
+                                           (SynLongIdent ([b], [], [None])),
+                                         /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,22--2,27)))],
+                                  /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,14--2,27)),
+                               LongIdent (SynLongIdent ([int], [], [None])),
+                               /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,14--2,34),
+                               { ArrowRange =
+                                  /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,28--2,30) }),
+                            SynValInfo
+                              ([[SynArgInfo ([], false, Some p1);
+                                 SynArgInfo ([], false, Some p2)]],
+                               SynArgInfo ([], false, None)), false, false,
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None,
+                            /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,4--2,34),
+                            { LeadingKeyword =
+                               Member
+                                 /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,4--2,10)
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange = None }),
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = Member },
+                         /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,4--2,34),
+                         { GetSetKeywords = None })],
+                     /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,4--2,34)),
+                  [],
+                  /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (1,5--2,34),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (1,7--1,8)
+                    WithKeyword = None })],
+              /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (1,0--2,34))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (1,0--2,34),
+          { LeadingKeyword = None })], { ConditionalDirectives = []
+                                         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs
new file mode 100644
index 00000000000..8246778c867
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs
@@ -0,0 +1 @@
+[<Measure>] type X = / second
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
new file mode 100644
index 00000000000..fdd840c0414
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
@@ -0,0 +1,52 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs", false,
+      QualifiedNameOfFile SynTypeTupleInMeasureTypeWithLeadingSlash, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeTupleInMeasureTypeWithLeadingSlash], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([{ Attributes =
+                         [{ TypeName = SynLongIdent ([Measure], [], [None])
+                            ArgExpr =
+                             Const
+                               (Unit,
+                                /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,2--1,9))
+                            Target = None
+                            AppliesToGetterAndSetter = false
+                            Range =
+                             /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,2--1,9) }]
+                        Range =
+                         /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,0--1,11) }],
+                     None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,17--1,18)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok,
+                        Tuple
+                          (false,
+                           [Slash
+                              /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,21--1,22);
+                            Type
+                              (LongIdent (SynLongIdent ([second], [], [None])))],
+                           /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,21--1,29)),
+                        /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,21--1,29)),
+                     /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,21--1,29)),
+                  [], None,
+                  /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,0--1,29),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,12--1,16)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,19--1,20)
+                    WithKeyword = None })],
+              /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,0--1,29))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,0--1,29),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs
new file mode 100644
index 00000000000..08356c5ac29
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs
@@ -0,0 +1 @@
+[<Measure>] type X = Y * Z
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
new file mode 100644
index 00000000000..56d321120d9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
@@ -0,0 +1,52 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeTupleInMeasureTypeWithNoSlashes.fs", false,
+      QualifiedNameOfFile SynTypeTupleInMeasureTypeWithNoSlashes, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeTupleInMeasureTypeWithNoSlashes], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([{ Attributes =
+                         [{ TypeName = SynLongIdent ([Measure], [], [None])
+                            ArgExpr =
+                             Const
+                               (Unit,
+                                /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,2--1,9))
+                            Target = None
+                            AppliesToGetterAndSetter = false
+                            Range =
+                             /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,2--1,9) }]
+                        Range =
+                         /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,0--1,11) }],
+                     None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,17--1,18)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok,
+                        Tuple
+                          (false,
+                           [Type (LongIdent (SynLongIdent ([Y], [], [None])));
+                            Star
+                              /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,23--1,24);
+                            Type (LongIdent (SynLongIdent ([Z], [], [None])))],
+                           /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,21--1,26)),
+                        /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,21--1,26)),
+                     /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,21--1,26)),
+                  [], None,
+                  /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,0--1,26),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,12--1,16)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,19--1,20)
+                    WithKeyword = None })],
+              /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,0--1,26))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,0--1,26),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs
new file mode 100644
index 00000000000..dc96983c185
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs
@@ -0,0 +1 @@
+[<Measure>] type R = X * Y / Z
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
new file mode 100644
index 00000000000..18fc0379e8d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
@@ -0,0 +1,55 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs", false,
+      QualifiedNameOfFile SynTypeTupleInMeasureTypeWithStartAndSlash, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeTupleInMeasureTypeWithStartAndSlash], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([{ Attributes =
+                         [{ TypeName = SynLongIdent ([Measure], [], [None])
+                            ArgExpr =
+                             Const
+                               (Unit,
+                                /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,2--1,9))
+                            Target = None
+                            AppliesToGetterAndSetter = false
+                            Range =
+                             /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,2--1,9) }]
+                        Range =
+                         /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,0--1,11) }],
+                     None, [], [R],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,17--1,18)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok,
+                        Tuple
+                          (false,
+                           [Type (LongIdent (SynLongIdent ([X], [], [None])));
+                            Star
+                              /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,23--1,24);
+                            Type (LongIdent (SynLongIdent ([Y], [], [None])));
+                            Slash
+                              /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,27--1,28);
+                            Type (LongIdent (SynLongIdent ([Z], [], [None])))],
+                           /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,21--1,30)),
+                        /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,21--1,30)),
+                     /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,21--1,30)),
+                  [], None,
+                  /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,0--1,30),
+                  { LeadingKeyword =
+                     Type
+                       /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,12--1,16)
+                    EqualsRange =
+                     Some
+                       /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,19--1,20)
+                    WithKeyword = None })],
+              /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,0--1,30))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,0--1,30),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs
new file mode 100644
index 00000000000..ffc7c0c813b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs
@@ -0,0 +1 @@
+let _: struct (int * int = ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs.bsl b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs.bsl
new file mode 100644
index 00000000000..11bb09a1064
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs.bsl
@@ -0,0 +1,52 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeTupleWithStruct,Recovery.fs", false,
+      QualifiedNameOfFile SynTypeTupleWithStruct,Recovery, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeTupleWithStruct,Recovery], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild /root/SynTypeTupleWithStruct,Recovery.fs (1,4--1,5),
+                  Some
+                    (SynBindingReturnInfo
+                       (Tuple
+                          (true,
+                           [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                            Star
+                              /root/SynTypeTupleWithStruct,Recovery.fs (1,19--1,20);
+                            Type (LongIdent (SynLongIdent ([int], [], [None])))],
+                           /root/SynTypeTupleWithStruct,Recovery.fs (1,7--1,24)),
+                        /root/SynTypeTupleWithStruct,Recovery.fs (1,7--1,26), [],
+                        { ColonRange =
+                           Some
+                             /root/SynTypeTupleWithStruct,Recovery.fs (1,5--1,6) })),
+                  Typed
+                    (Const
+                       (Unit,
+                        /root/SynTypeTupleWithStruct,Recovery.fs (1,27--1,29)),
+                     Tuple
+                       (true,
+                        [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                         Star
+                           /root/SynTypeTupleWithStruct,Recovery.fs (1,19--1,20);
+                         Type (LongIdent (SynLongIdent ([int], [], [None])))],
+                        /root/SynTypeTupleWithStruct,Recovery.fs (1,7--1,24)),
+                     /root/SynTypeTupleWithStruct,Recovery.fs (1,27--1,29)),
+                  /root/SynTypeTupleWithStruct,Recovery.fs (1,4--1,5),
+                  Yes /root/SynTypeTupleWithStruct,Recovery.fs (1,0--1,29),
+                  { LeadingKeyword =
+                     Let /root/SynTypeTupleWithStruct,Recovery.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some /root/SynTypeTupleWithStruct,Recovery.fs (1,25--1,26) })],
+              /root/SynTypeTupleWithStruct,Recovery.fs (1,0--1,29))],
+          PreXmlDocEmpty, [], None,
+          /root/SynTypeTupleWithStruct,Recovery.fs (1,0--1,29),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs
new file mode 100644
index 00000000000..fbd0e72cd44
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs
@@ -0,0 +1 @@
+let _: struct (int * int) = ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs.bsl b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs.bsl
new file mode 100644
index 00000000000..c94f3fd47e8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs.bsl
@@ -0,0 +1,46 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynTypeTupleWithStruct.fs", false,
+      QualifiedNameOfFile SynTypeTupleWithStruct, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeTupleWithStruct], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild /root/SynTypeTupleWithStruct.fs (1,4--1,5),
+                  Some
+                    (SynBindingReturnInfo
+                       (Tuple
+                          (true,
+                           [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                            Star /root/SynTypeTupleWithStruct.fs (1,19--1,20);
+                            Type (LongIdent (SynLongIdent ([int], [], [None])))],
+                           /root/SynTypeTupleWithStruct.fs (1,7--1,25)),
+                        /root/SynTypeTupleWithStruct.fs (1,7--1,25), [],
+                        { ColonRange =
+                           Some /root/SynTypeTupleWithStruct.fs (1,5--1,6) })),
+                  Typed
+                    (Const (Unit, /root/SynTypeTupleWithStruct.fs (1,28--1,30)),
+                     Tuple
+                       (true,
+                        [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                         Star /root/SynTypeTupleWithStruct.fs (1,19--1,20);
+                         Type (LongIdent (SynLongIdent ([int], [], [None])))],
+                        /root/SynTypeTupleWithStruct.fs (1,7--1,25)),
+                     /root/SynTypeTupleWithStruct.fs (1,28--1,30)),
+                  /root/SynTypeTupleWithStruct.fs (1,4--1,5),
+                  Yes /root/SynTypeTupleWithStruct.fs (1,0--1,30),
+                  { LeadingKeyword =
+                     Let /root/SynTypeTupleWithStruct.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some /root/SynTypeTupleWithStruct.fs (1,26--1,27) })],
+              /root/SynTypeTupleWithStruct.fs (1,0--1,30))], PreXmlDocEmpty, [],
+          None, /root/SynTypeTupleWithStruct.fs (1,0--1,30),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs b/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs
new file mode 100644
index 00000000000..28980e9554d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs
@@ -0,0 +1,2 @@
+type X =
+    | a: int * z:int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs.bsl b/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs.bsl
new file mode 100644
index 00000000000..c2cacc436db
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs.bsl
@@ -0,0 +1,50 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynUnionCaseKindFullType.fs", false,
+      QualifiedNameOfFile SynUnionCaseKindFullType, [], [],
+      [SynModuleOrNamespace
+         ([SynUnionCaseKindFullType], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/SynUnionCaseKindFullType.fs (1,5--1,6)),
+                  Simple
+                    (Union
+                       (None,
+                        [SynUnionCase
+                           ([], SynIdent (a, None),
+                            FullType
+                              (Tuple
+                                 (false,
+                                  [Type
+                                     (LongIdent
+                                        (SynLongIdent ([int], [], [None])));
+                                   Star
+                                     /root/SynUnionCaseKindFullType.fs (2,13--2,14);
+                                   Type
+                                     (SignatureParameter
+                                        ([], false, Some z,
+                                         LongIdent
+                                           (SynLongIdent ([int], [], [None])),
+                                         /root/SynUnionCaseKindFullType.fs (2,15--2,20)))],
+                                  /root/SynUnionCaseKindFullType.fs (2,9--2,20)),
+                               SynValInfo ([], SynArgInfo ([], false, None))),
+                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, /root/SynUnionCaseKindFullType.fs (2,6--2,20),
+                            { BarRange =
+                               Some /root/SynUnionCaseKindFullType.fs (2,4--2,5) })],
+                        /root/SynUnionCaseKindFullType.fs (2,4--2,20)),
+                     /root/SynUnionCaseKindFullType.fs (2,4--2,20)), [], None,
+                  /root/SynUnionCaseKindFullType.fs (1,5--2,20),
+                  { LeadingKeyword =
+                     Type /root/SynUnionCaseKindFullType.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/SynUnionCaseKindFullType.fs (1,7--1,8)
+                    WithKeyword = None })],
+              /root/SynUnionCaseKindFullType.fs (1,0--2,20))], PreXmlDocEmpty,
+          [], None, /root/SynUnionCaseKindFullType.fs (1,0--2,20),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi b/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi
new file mode 100644
index 00000000000..c8e443d4d95
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi
@@ -0,0 +1,5 @@
+module Meh
+val InferSynValData:
+    memberFlagsOpt: SynMemberFlags option * pat: SynPat option * SynReturnInfo option * origRhsExpr: SynExpr ->
+        x: string ->
+            SynValData2
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi.bsl b/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi.bsl
new file mode 100644
index 00000000000..97b2ff3fdea
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi.bsl
@@ -0,0 +1,88 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SynValSigContainsParameterNames.fsi", QualifiedNameOfFile Meh, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, NamedModule,
+          [Val
+             (SynValSig
+                ([], SynIdent (InferSynValData, None),
+                 SynValTyparDecls (None, true),
+                 Fun
+                   (Tuple
+                      (false,
+                       [Type
+                          (SignatureParameter
+                             ([], false, Some memberFlagsOpt,
+                              App
+                                (LongIdent (SynLongIdent ([option], [], [None])),
+                                 None,
+                                 [LongIdent
+                                    (SynLongIdent ([SynMemberFlags], [], [None]))],
+                                 [], None, true,
+                                 /root/SynValSigContainsParameterNames.fsi (3,20--3,41)),
+                              /root/SynValSigContainsParameterNames.fsi (3,4--3,41)));
+                        Star
+                          /root/SynValSigContainsParameterNames.fsi (3,42--3,43);
+                        Type
+                          (SignatureParameter
+                             ([], false, Some pat,
+                              App
+                                (LongIdent (SynLongIdent ([option], [], [None])),
+                                 None,
+                                 [LongIdent
+                                    (SynLongIdent ([SynPat], [], [None]))], [],
+                                 None, true,
+                                 /root/SynValSigContainsParameterNames.fsi (3,49--3,62)),
+                              /root/SynValSigContainsParameterNames.fsi (3,44--3,62)));
+                        Star
+                          /root/SynValSigContainsParameterNames.fsi (3,63--3,64);
+                        Type
+                          (App
+                             (LongIdent (SynLongIdent ([option], [], [None])),
+                              None,
+                              [LongIdent
+                                 (SynLongIdent ([SynReturnInfo], [], [None]))],
+                              [], None, true,
+                              /root/SynValSigContainsParameterNames.fsi (3,65--3,85)));
+                        Star
+                          /root/SynValSigContainsParameterNames.fsi (3,86--3,87);
+                        Type
+                          (SignatureParameter
+                             ([], false, Some origRhsExpr,
+                              LongIdent (SynLongIdent ([SynExpr], [], [None])),
+                              /root/SynValSigContainsParameterNames.fsi (3,88--3,108)))],
+                       /root/SynValSigContainsParameterNames.fsi (3,4--3,108)),
+                    Fun
+                      (SignatureParameter
+                         ([], false, Some x,
+                          LongIdent (SynLongIdent ([string], [], [None])),
+                          /root/SynValSigContainsParameterNames.fsi (4,8--4,17)),
+                       LongIdent (SynLongIdent ([SynValData2], [], [None])),
+                       /root/SynValSigContainsParameterNames.fsi (4,8--5,23),
+                       { ArrowRange =
+                          /root/SynValSigContainsParameterNames.fsi (4,18--4,20) }),
+                    /root/SynValSigContainsParameterNames.fsi (3,4--5,23),
+                    { ArrowRange =
+                       /root/SynValSigContainsParameterNames.fsi (3,109--3,111) }),
+                 SynValInfo
+                   ([[SynArgInfo ([], false, Some memberFlagsOpt);
+                      SynArgInfo ([], false, Some pat);
+                      SynArgInfo ([], false, None);
+                      SynArgInfo ([], false, Some origRhsExpr)];
+                     [SynArgInfo ([], false, Some x)]],
+                    SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None, /root/SynValSigContainsParameterNames.fsi (2,0--5,23),
+                 { LeadingKeyword =
+                    Val /root/SynValSigContainsParameterNames.fsi (2,0--2,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange = None }),
+              /root/SynValSigContainsParameterNames.fsi (2,0--5,23))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/SynValSigContainsParameterNames.fsi (1,0--5,23),
+          { LeadingKeyword =
+             Module /root/SynValSigContainsParameterNames.fsi (1,0--1,6) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SyntheticKeyword.fs b/tests/service/data/SyntaxTree/SyntheticKeyword.fs
new file mode 100644
index 00000000000..4165b212a57
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SyntheticKeyword.fs
@@ -0,0 +1,2 @@
+{ new ISomething with
+    a = () }
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SyntheticKeyword.fs.bsl b/tests/service/data/SyntaxTree/SyntheticKeyword.fs.bsl
new file mode 100644
index 00000000000..a8ac909694c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SyntheticKeyword.fs.bsl
@@ -0,0 +1,30 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SyntheticKeyword.fs", false, QualifiedNameOfFile SyntheticKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([SyntheticKeyword], false, AnonModule,
+          [Expr
+             (ObjExpr
+                (LongIdent (SynLongIdent ([ISomething], [], [None])), None,
+                 Some /root/SyntheticKeyword.fs (1,17--1,21),
+                 [SynBinding
+                    (None, Normal, false, false, [], PreXmlDocEmpty,
+                     SynValData
+                       (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                        None),
+                     Named
+                       (SynIdent (a, None), false, None,
+                        /root/SyntheticKeyword.fs (2,4--2,5)), None,
+                     Const (Unit, /root/SyntheticKeyword.fs (2,8--2,10)),
+                     /root/SyntheticKeyword.fs (2,4--2,5),
+                     Yes /root/SyntheticKeyword.fs (2,8--2,10),
+                     { LeadingKeyword = Synthetic
+                       InlineKeyword = None
+                       EqualsRange = Some /root/SyntheticKeyword.fs (2,6--2,7) })],
+                 [], [], /root/SyntheticKeyword.fs (1,2--1,16),
+                 /root/SyntheticKeyword.fs (1,0--2,12)),
+              /root/SyntheticKeyword.fs (1,0--2,12))], PreXmlDocEmpty, [], None,
+          /root/SyntheticKeyword.fs (1,0--2,12), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs b/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs
new file mode 100644
index 00000000000..82b92088432
--- /dev/null
+++ b/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs
@@ -0,0 +1 @@
+#nowarn \"\"\"40\"\"\"
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
new file mode 100644
index 00000000000..2e851f972d5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
@@ -0,0 +1,16 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/TripleQuoteStringAsParsedHashDirectiveArgument.fs", false,
+      QualifiedNameOfFile TripleQuoteStringAsParsedHashDirectiveArgument, [], [],
+      [SynModuleOrNamespace
+         ([TripleQuoteStringAsParsedHashDirectiveArgument], false, AnonModule,
+          [HashDirective
+             (ParsedHashDirective
+                ("nowarn", [],
+                 /root/TripleQuoteStringAsParsedHashDirectiveArgument.fs (1,0--1,7)),
+              /root/TripleQuoteStringAsParsedHashDirectiveArgument.fs (1,0--1,9))],
+          PreXmlDocEmpty, [], None,
+          /root/TripleQuoteStringAsParsedHashDirectiveArgument.fs (1,0--1,9),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs b/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs
new file mode 100644
index 00000000000..ec5ed382d1a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs
@@ -0,0 +1,8 @@
+/// Valid xml doc
+let x =
+    /// Some great documentation comment
+
+    /// With a blank line in between
+    /// but on a while loop
+    while true do ()
+    a + 1
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs.bsl b/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs.bsl
new file mode 100644
index 00000000000..d5d7a4e79b2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs.bsl
@@ -0,0 +1,71 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs",
+      false,
+      QualifiedNameOfFile
+        TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation, [], [],
+      [SynModuleOrNamespace
+         ([TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation], false,
+          AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (x, None), false, None,
+                     /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (2,4--2,5)),
+                  None,
+                  Sequential
+                    (SuppressNeither, true,
+                     While
+                       (Yes
+                          /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (7,4--7,14),
+                        Const
+                          (Bool true,
+                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (7,10--7,14)),
+                        Const
+                          (Unit,
+                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (7,18--7,20)),
+                        /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (7,4--7,20)),
+                     App
+                       (NonAtomic, false,
+                        App
+                          (NonAtomic, true,
+                           LongIdent
+                             (false,
+                              SynLongIdent
+                                ([op_Addition], [],
+                                 [Some (OriginalNotation "+")]), None,
+                              /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,6--8,7)),
+                           Ident a,
+                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,4--8,7)),
+                        Const
+                          (Int32 1,
+                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,8--8,9)),
+                        /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,4--8,9)),
+                     /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (7,4--8,9)),
+                  /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (1,0--2,5),
+                  NoneAtLet,
+                  { LeadingKeyword =
+                     Let
+                       /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (2,6--2,7) })],
+              /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (1,0--8,9))],
+          PreXmlDocEmpty, [], None,
+          /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (2,0--8,9),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (3,4--3,40);
+          LineComment
+            /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (5,4--5,36);
+          LineComment
+            /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (6,4--6,27)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs b/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs
new file mode 100644
index 00000000000..730b937bfb7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs
@@ -0,0 +1,2 @@
+/// Some great documentation comment
+let x = 0
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs.bsl b/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs.bsl
new file mode 100644
index 00000000000..66ec51c062c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs.bsl
@@ -0,0 +1,35 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/TripleSlashCommentShouldNotBeCaptured.fs", false,
+      QualifiedNameOfFile TripleSlashCommentShouldNotBeCaptured, [], [],
+      [SynModuleOrNamespace
+         ([TripleSlashCommentShouldNotBeCaptured], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (x, None), false, None,
+                     /root/TripleSlashCommentShouldNotBeCaptured.fs (2,4--2,5)),
+                  None,
+                  Const
+                    (Int32 0,
+                     /root/TripleSlashCommentShouldNotBeCaptured.fs (2,8--2,9)),
+                  /root/TripleSlashCommentShouldNotBeCaptured.fs (1,0--2,5),
+                  Yes /root/TripleSlashCommentShouldNotBeCaptured.fs (2,0--2,9),
+                  { LeadingKeyword =
+                     Let
+                       /root/TripleSlashCommentShouldNotBeCaptured.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/TripleSlashCommentShouldNotBeCaptured.fs (2,6--2,7) })],
+              /root/TripleSlashCommentShouldNotBeCaptured.fs (1,0--2,9))],
+          PreXmlDocEmpty, [], None,
+          /root/TripleSlashCommentShouldNotBeCaptured.fs (2,0--2,9),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi b/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi
new file mode 100644
index 00000000000..1d75e9444a1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi
@@ -0,0 +1,14 @@
+module Meh
+
+type X =
+    member a : int = 10
+
+/// Represents a line number when using zero-based line counting (used by Visual Studio)
+#if CHECK_LINE0_TYPES
+
+#else
+type Y = int
+#endif
+
+type Z with
+    static member P : int -> int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi.bsl b/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
new file mode 100644
index 00000000000..96c68686c76
--- /dev/null
+++ b/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
@@ -0,0 +1,132 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/TriviaIsPresentInSynTypeDefnSig.fsi", QualifiedNameOfFile Meh, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, NamedModule,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (3,5--3,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynValSig
+                           ([], SynIdent (a, None),
+                            SynValTyparDecls (None, true),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            SynValInfo ([], SynArgInfo ([], false, None)), false,
+                            false,
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            Some
+                              (Const
+                                 (Int32 10,
+                                  /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,21--4,23))),
+                            /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,4--4,23),
+                            { LeadingKeyword =
+                               Member
+                                 /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,4--4,10)
+                              InlineKeyword = None
+                              WithKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,19--4,20) }),
+                         { IsInstance = true
+                           IsDispatchSlot = false
+                           IsOverrideOrExplicitImpl = false
+                           IsFinal = false
+                           GetterOrSetterIsCompilerGenerated = false
+                           MemberKind = PropertyGet },
+                         /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,4--4,23),
+                         { GetSetKeywords = None })],
+                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,4--4,23)), [],
+                  /root/TriviaIsPresentInSynTypeDefnSig.fsi (3,5--4,23),
+                  { LeadingKeyword =
+                     Type /root/TriviaIsPresentInSynTypeDefnSig.fsi (3,0--3,4)
+                    EqualsRange =
+                     Some /root/TriviaIsPresentInSynTypeDefnSig.fsi (3,7--3,8)
+                    WithKeyword = None })],
+              /root/TriviaIsPresentInSynTypeDefnSig.fsi (3,0--4,23));
+           Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Y],
+                     PreXmlDoc ((10,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (10,5--10,6)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok, LongIdent (SynLongIdent ([int], [], [None])),
+                        /root/TriviaIsPresentInSynTypeDefnSig.fsi (10,9--10,12)),
+                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (10,9--10,12)),
+                  [], /root/TriviaIsPresentInSynTypeDefnSig.fsi (6,0--10,12),
+                  { LeadingKeyword =
+                     Type /root/TriviaIsPresentInSynTypeDefnSig.fsi (10,0--10,4)
+                    EqualsRange =
+                     Some /root/TriviaIsPresentInSynTypeDefnSig.fsi (10,7--10,8)
+                    WithKeyword = None })],
+              /root/TriviaIsPresentInSynTypeDefnSig.fsi (6,0--10,12));
+           Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Z],
+                     PreXmlDoc ((13,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,5--13,6)),
+                  Simple
+                    (None
+                       /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,5--14,32),
+                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,5--14,32)),
+                  [Member
+                     (SynValSig
+                        ([], SynIdent (P, None), SynValTyparDecls (None, true),
+                         Fun
+                           (LongIdent (SynLongIdent ([int], [], [None])),
+                            LongIdent (SynLongIdent ([int], [], [None])),
+                            /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,22--14,32),
+                            { ArrowRange =
+                               /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,26--14,28) }),
+                         SynValInfo
+                           ([[SynArgInfo ([], false, None)]],
+                            SynArgInfo ([], false, None)), false, false,
+                         PreXmlDoc ((14,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None, None,
+                         /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,4--14,32),
+                         { LeadingKeyword =
+                            StaticMember
+                              (/root/TriviaIsPresentInSynTypeDefnSig.fsi (14,4--14,10),
+                               /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,11--14,17))
+                           InlineKeyword = None
+                           WithKeyword = None
+                           EqualsRange = None }),
+                      { IsInstance = false
+                        IsDispatchSlot = false
+                        IsOverrideOrExplicitImpl = false
+                        IsFinal = false
+                        GetterOrSetterIsCompilerGenerated = false
+                        MemberKind = Member },
+                      /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,4--14,32),
+                      { GetSetKeywords = None })],
+                  /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,5--14,32),
+                  { LeadingKeyword =
+                     Type /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,0--13,4)
+                    EqualsRange = None
+                    WithKeyword =
+                     Some
+                       /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,7--13,11) })],
+              /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,0--14,32))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/TriviaIsPresentInSynTypeDefnSig.fsi (1,0--14,32),
+          { LeadingKeyword =
+             Module /root/TriviaIsPresentInSynTypeDefnSig.fsi (1,0--1,6) })],
+      { ConditionalDirectives =
+         [If
+            (Ident "CHECK_LINE0_TYPES",
+             /root/TriviaIsPresentInSynTypeDefnSig.fsi (7,0--7,21));
+          Else /root/TriviaIsPresentInSynTypeDefnSig.fsi (9,0--9,5);
+          EndIf /root/TriviaIsPresentInSynTypeDefnSig.fsi (11,0--11,6)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs
new file mode 100644
index 00000000000..a39a01f0d49
--- /dev/null
+++ b/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs
@@ -0,0 +1 @@
+fun (x, _) -> x * 3
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs.bsl
new file mode 100644
index 00000000000..fe61a13b94a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs.bsl
@@ -0,0 +1,64 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/TupleInLambdaHasArrowRange.fs", false,
+      QualifiedNameOfFile TupleInLambdaHasArrowRange, [], [],
+      [SynModuleOrNamespace
+         ([TupleInLambdaHasArrowRange], false, AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (x, None, false, false, false,
+                        /root/TupleInLambdaHasArrowRange.fs (1,5--1,6));
+                     Id
+                       (_arg1, None, true, false, false,
+                        /root/TupleInLambdaHasArrowRange.fs (1,8--1,9))],
+                    /root/TupleInLambdaHasArrowRange.fs (1,4--1,10)),
+                 App
+                   (NonAtomic, false,
+                    App
+                      (NonAtomic, true,
+                       LongIdent
+                         (false,
+                          SynLongIdent
+                            ([op_Multiply], [], [Some (OriginalNotation "*")]),
+                          None, /root/TupleInLambdaHasArrowRange.fs (1,16--1,17)),
+                       Ident x, /root/TupleInLambdaHasArrowRange.fs (1,14--1,17)),
+                    Const
+                      (Int32 3, /root/TupleInLambdaHasArrowRange.fs (1,18--1,19)),
+                    /root/TupleInLambdaHasArrowRange.fs (1,14--1,19)),
+                 Some
+                   ([Paren
+                       (Tuple
+                          (false,
+                           [Named
+                              (SynIdent (x, None), false, None,
+                               /root/TupleInLambdaHasArrowRange.fs (1,5--1,6));
+                            Wild /root/TupleInLambdaHasArrowRange.fs (1,8--1,9)],
+                           /root/TupleInLambdaHasArrowRange.fs (1,5--1,9)),
+                        /root/TupleInLambdaHasArrowRange.fs (1,4--1,10))],
+                    App
+                      (NonAtomic, false,
+                       App
+                         (NonAtomic, true,
+                          LongIdent
+                            (false,
+                             SynLongIdent
+                               ([op_Multiply], [], [Some (OriginalNotation "*")]),
+                             None,
+                             /root/TupleInLambdaHasArrowRange.fs (1,16--1,17)),
+                          Ident x,
+                          /root/TupleInLambdaHasArrowRange.fs (1,14--1,17)),
+                       Const
+                         (Int32 3,
+                          /root/TupleInLambdaHasArrowRange.fs (1,18--1,19)),
+                       /root/TupleInLambdaHasArrowRange.fs (1,14--1,19))),
+                 /root/TupleInLambdaHasArrowRange.fs (1,0--1,19),
+                 { ArrowRange =
+                    Some /root/TupleInLambdaHasArrowRange.fs (1,11--1,13) }),
+              /root/TupleInLambdaHasArrowRange.fs (1,0--1,19))], PreXmlDocEmpty,
+          [], None, /root/TupleInLambdaHasArrowRange.fs (1,0--1,19),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs b/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs
new file mode 100644
index 00000000000..b18ebcb3c59
--- /dev/null
+++ b/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs
@@ -0,0 +1,2 @@
+let a : int * string = failwith "todo"
+let b : int * string * bool = 1, "", false
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs.bsl b/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
new file mode 100644
index 00000000000..d0d4e1a31d4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
@@ -0,0 +1,131 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/TupleReturnTypeOfBindingShouldContainStars.fs", false,
+      QualifiedNameOfFile TupleReturnTypeOfBindingShouldContainStars, [], [],
+      [SynModuleOrNamespace
+         ([TupleReturnTypeOfBindingShouldContainStars], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (a, None), false, None,
+                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,4--1,5)),
+                  Some
+                    (SynBindingReturnInfo
+                       (Tuple
+                          (false,
+                           [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                            Star
+                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,12--1,13);
+                            Type
+                              (LongIdent (SynLongIdent ([string], [], [None])))],
+                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,8--1,20)),
+                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,8--1,20),
+                        [],
+                        { ColonRange =
+                           Some
+                             /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,6--1,7) })),
+                  Typed
+                    (App
+                       (NonAtomic, false, Ident failwith,
+                        Const
+                          (String
+                             ("todo", Regular,
+                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,32--1,38)),
+                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,32--1,38)),
+                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,23--1,38)),
+                     Tuple
+                       (false,
+                        [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                         Star
+                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,12--1,13);
+                         Type (LongIdent (SynLongIdent ([string], [], [None])))],
+                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,8--1,20)),
+                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,23--1,38)),
+                  /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,4--1,5),
+                  Yes
+                    /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,0--1,38),
+                  { LeadingKeyword =
+                     Let
+                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,0--1,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,21--1,22) })],
+              /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,0--1,38));
+           Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (b, None), false, None,
+                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,4--2,5)),
+                  Some
+                    (SynBindingReturnInfo
+                       (Tuple
+                          (false,
+                           [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                            Star
+                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,12--2,13);
+                            Type
+                              (LongIdent (SynLongIdent ([string], [], [None])));
+                            Star
+                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,21--2,22);
+                            Type (LongIdent (SynLongIdent ([bool], [], [None])))],
+                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,27)),
+                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,27),
+                        [],
+                        { ColonRange =
+                           Some
+                             /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,6--2,7) })),
+                  Typed
+                    (Tuple
+                       (false,
+                        [Const
+                           (Int32 1,
+                            /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,30--2,31));
+                         Const
+                           (String
+                              ("", Regular,
+                               /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,33--2,35)),
+                            /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,33--2,35));
+                         Const
+                           (Bool false,
+                            /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,37--2,42))],
+                        [/root/TupleReturnTypeOfBindingShouldContainStars.fs (2,31--2,32);
+                         /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,35--2,36)],
+                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,30--2,42)),
+                     Tuple
+                       (false,
+                        [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                         Star
+                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,12--2,13);
+                         Type (LongIdent (SynLongIdent ([string], [], [None])));
+                         Star
+                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,21--2,22);
+                         Type (LongIdent (SynLongIdent ([bool], [], [None])))],
+                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,27)),
+                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,30--2,42)),
+                  /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,4--2,5),
+                  Yes
+                    /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,42),
+                  { LeadingKeyword =
+                     Let
+                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,28--2,29) })],
+              /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,42))],
+          PreXmlDocEmpty, [], None,
+          /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,0--2,42),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs b/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs
new file mode 100644
index 00000000000..44bcdd090b5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs
@@ -0,0 +1,7 @@
+type Foo =
+/// docs for Thing
+| Thing of
+  /// docs for first
+  first: string *
+  /// docs for anon field
+  bool
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs.bsl b/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs.bsl
new file mode 100644
index 00000000000..8efc8681711
--- /dev/null
+++ b/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs.bsl
@@ -0,0 +1,55 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/UnionCaseFieldsCanHaveComments.fs", false,
+      QualifiedNameOfFile UnionCaseFieldsCanHaveComments, [], [],
+      [SynModuleOrNamespace
+         ([UnionCaseFieldsCanHaveComments], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/UnionCaseFieldsCanHaveComments.fs (1,5--1,8)),
+                  Simple
+                    (Union
+                       (None,
+                        [SynUnionCase
+                           ([], SynIdent (Thing, None),
+                            Fields
+                              [SynField
+                                 ([], false, Some first,
+                                  LongIdent
+                                    (SynLongIdent ([string], [], [None])), false,
+                                  PreXmlDoc ((5,2), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/UnionCaseFieldsCanHaveComments.fs (4,2--5,15),
+                                  { LeadingKeyword = None });
+                               SynField
+                                 ([], false, None,
+                                  LongIdent (SynLongIdent ([bool], [], [None])),
+                                  false,
+                                  PreXmlDoc ((7,2), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/UnionCaseFieldsCanHaveComments.fs (6,2--7,6),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/UnionCaseFieldsCanHaveComments.fs (2,0--7,6),
+                            { BarRange =
+                               Some
+                                 /root/UnionCaseFieldsCanHaveComments.fs (3,0--3,1) })],
+                        /root/UnionCaseFieldsCanHaveComments.fs (2,0--7,6)),
+                     /root/UnionCaseFieldsCanHaveComments.fs (2,0--7,6)), [],
+                  None, /root/UnionCaseFieldsCanHaveComments.fs (1,5--7,6),
+                  { LeadingKeyword =
+                     Type /root/UnionCaseFieldsCanHaveComments.fs (1,0--1,4)
+                    EqualsRange =
+                     Some /root/UnionCaseFieldsCanHaveComments.fs (1,9--1,10)
+                    WithKeyword = None })],
+              /root/UnionCaseFieldsCanHaveComments.fs (1,0--7,6))],
+          PreXmlDocEmpty, [], None,
+          /root/UnionCaseFieldsCanHaveComments.fs (1,0--7,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UseKeyword.fs b/tests/service/data/SyntaxTree/UseKeyword.fs
new file mode 100644
index 00000000000..84c2faa40d4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/UseKeyword.fs
@@ -0,0 +1,3 @@
+do
+    use x = X()
+    ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UseKeyword.fs.bsl b/tests/service/data/SyntaxTree/UseKeyword.fs.bsl
new file mode 100644
index 00000000000..fba354e4050
--- /dev/null
+++ b/tests/service/data/SyntaxTree/UseKeyword.fs.bsl
@@ -0,0 +1,34 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/UseKeyword.fs", false, QualifiedNameOfFile UseKeyword, [], [],
+      [SynModuleOrNamespace
+         ([UseKeyword], false, AnonModule,
+          [Expr
+             (Do
+                (LetOrUse
+                   (false, true,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (x, None), false, None,
+                           /root/UseKeyword.fs (2,8--2,9)), None,
+                        App
+                          (Atomic, false, Ident X,
+                           Const (Unit, /root/UseKeyword.fs (2,13--2,15)),
+                           /root/UseKeyword.fs (2,12--2,15)),
+                        /root/UseKeyword.fs (2,8--2,9),
+                        Yes /root/UseKeyword.fs (2,4--2,15),
+                        { LeadingKeyword = Use /root/UseKeyword.fs (2,4--2,7)
+                          InlineKeyword = None
+                          EqualsRange = Some /root/UseKeyword.fs (2,10--2,11) })],
+                    Const (Unit, /root/UseKeyword.fs (3,4--3,6)),
+                    /root/UseKeyword.fs (2,4--3,6), { InKeyword = None }),
+                 /root/UseKeyword.fs (1,0--3,6)), /root/UseKeyword.fs (1,0--3,6))],
+          PreXmlDocEmpty, [], None, /root/UseKeyword.fs (1,0--3,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UseRecKeyword.fs b/tests/service/data/SyntaxTree/UseRecKeyword.fs
new file mode 100644
index 00000000000..f3743ffff8e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/UseRecKeyword.fs
@@ -0,0 +1,3 @@
+do
+    use rec x = X()
+    ()
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UseRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/UseRecKeyword.fs.bsl
new file mode 100644
index 00000000000..f8184cba34b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/UseRecKeyword.fs.bsl
@@ -0,0 +1,37 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/UseRecKeyword.fs", false, QualifiedNameOfFile UseRecKeyword, [], [],
+      [SynModuleOrNamespace
+         ([UseRecKeyword], false, AnonModule,
+          [Expr
+             (Do
+                (LetOrUse
+                   (true, true,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (x, None), false, None,
+                           /root/UseRecKeyword.fs (2,12--2,13)), None,
+                        App
+                          (Atomic, false, Ident X,
+                           Const (Unit, /root/UseRecKeyword.fs (2,17--2,19)),
+                           /root/UseRecKeyword.fs (2,16--2,19)),
+                        /root/UseRecKeyword.fs (2,12--2,13),
+                        Yes /root/UseRecKeyword.fs (2,4--2,19),
+                        { LeadingKeyword =
+                           UseRec
+                             (/root/UseRecKeyword.fs (2,4--2,7),
+                              /root/UseRecKeyword.fs (2,8--2,11))
+                          InlineKeyword = None
+                          EqualsRange = Some /root/UseRecKeyword.fs (2,14--2,15) })],
+                    Const (Unit, /root/UseRecKeyword.fs (3,4--3,6)),
+                    /root/UseRecKeyword.fs (2,4--3,6), { InKeyword = None }),
+                 /root/UseRecKeyword.fs (1,0--3,6)),
+              /root/UseRecKeyword.fs (1,0--3,6))], PreXmlDocEmpty, [], None,
+          /root/UseRecKeyword.fs (1,0--3,6), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ValKeyword.fsi b/tests/service/data/SyntaxTree/ValKeyword.fsi
new file mode 100644
index 00000000000..ca027d46f5a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ValKeyword.fsi
@@ -0,0 +1,4 @@
+namespace X
+
+type Y =
+    val F : int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ValKeyword.fsi.bsl
new file mode 100644
index 00000000000..425d1ea53db
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ValKeyword.fsi.bsl
@@ -0,0 +1,31 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/ValKeyword.fsi", QualifiedNameOfFile ValKeyword, [], [],
+      [SynModuleOrNamespaceSig
+         ([X], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Y],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/ValKeyword.fsi (3,5--3,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [ValField
+                        (SynField
+                           ([], false, Some F,
+                            LongIdent (SynLongIdent ([int], [], [None])), false,
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, /root/ValKeyword.fsi (4,4--4,15),
+                            { LeadingKeyword =
+                               Some (Val /root/ValKeyword.fsi (4,4--4,7)) }),
+                         /root/ValKeyword.fsi (4,4--4,15))],
+                     /root/ValKeyword.fsi (4,4--4,15)), [],
+                  /root/ValKeyword.fsi (3,5--4,15),
+                  { LeadingKeyword = Type /root/ValKeyword.fsi (3,0--3,4)
+                    EqualsRange = Some /root/ValKeyword.fsi (3,7--3,8)
+                    WithKeyword = None })], /root/ValKeyword.fsi (3,0--4,15))],
+          PreXmlDocEmpty, [], None, /root/ValKeyword.fsi (1,0--4,15),
+          { LeadingKeyword = Namespace /root/ValKeyword.fsi (1,0--1,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi b/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi
new file mode 100644
index 00000000000..ee918954f7c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi
@@ -0,0 +1,5 @@
+module Meh
+
+[<Foo>]
+// meh
+val a : int
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi.bsl b/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi.bsl
new file mode 100644
index 00000000000..8d1f7605264
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi.bsl
@@ -0,0 +1,38 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/ValKeywordIsPresentInSynValSig.fsi", QualifiedNameOfFile Meh, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, NamedModule,
+          [Val
+             (SynValSig
+                ([{ Attributes =
+                     [{ TypeName = SynLongIdent ([Foo], [], [None])
+                        ArgExpr =
+                         Const
+                           (Unit,
+                            /root/ValKeywordIsPresentInSynValSig.fsi (3,2--3,5))
+                        Target = None
+                        AppliesToGetterAndSetter = false
+                        Range =
+                         /root/ValKeywordIsPresentInSynValSig.fsi (3,2--3,5) }]
+                    Range = /root/ValKeywordIsPresentInSynValSig.fsi (3,0--3,7) }],
+                 SynIdent (a, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None, /root/ValKeywordIsPresentInSynValSig.fsi (3,0--5,11),
+                 { LeadingKeyword =
+                    Val /root/ValKeywordIsPresentInSynValSig.fsi (5,0--5,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange = None }),
+              /root/ValKeywordIsPresentInSynValSig.fsi (3,0--5,11))],
+          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/ValKeywordIsPresentInSynValSig.fsi (1,0--5,11),
+          { LeadingKeyword =
+             Module /root/ValKeywordIsPresentInSynValSig.fsi (1,0--1,6) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/ValKeywordIsPresentInSynValSig.fsi (4,0--4,6)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs b/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs
new file mode 100644
index 00000000000..3f7b9f37894
--- /dev/null
+++ b/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs
@@ -0,0 +1 @@
+#I @\"C:\\Temp\"
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
new file mode 100644
index 00000000000..f5b4164c7c3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
@@ -0,0 +1,16 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/VerbatimStringAsParsedHashDirectiveArgument.fs", false,
+      QualifiedNameOfFile VerbatimStringAsParsedHashDirectiveArgument, [], [],
+      [SynModuleOrNamespace
+         ([VerbatimStringAsParsedHashDirectiveArgument], false, AnonModule,
+          [HashDirective
+             (ParsedHashDirective
+                ("I", [],
+                 /root/VerbatimStringAsParsedHashDirectiveArgument.fs (1,0--1,2)),
+              /root/VerbatimStringAsParsedHashDirectiveArgument.fs (1,0--1,4))],
+          PreXmlDocEmpty, [], None,
+          /root/VerbatimStringAsParsedHashDirectiveArgument.fs (1,0--1,4),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
new file mode 100644
index 00000000000..d57977a323f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
@@ -0,0 +1,3 @@
+type Foo() =
+    // A write-only property.
+    member this.MyWriteOnlyProperty with set (value) = myInternalValue <- value
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
new file mode 100644
index 00000000000..7682ed077d2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -0,0 +1,112 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword],
+          false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                  ObjectModel
+                    (Unspecified,
+                     [ImplicitCtor
+                        (None, [],
+                         SimplePats
+                           ([],
+                            /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                         None,
+                         PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                         { AsKeyword = None });
+                      GetSetMember
+                        (None,
+                         Some
+                           (SynBinding
+                              (None, Normal, false, false, [],
+                               PreXmlMerge
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+                               SynValData
+                                 (Some
+                                    { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = PropertySet },
+                                  SynValInfo
+                                    ([[SynArgInfo ([], false, None)];
+                                      [SynArgInfo ([], false, Some value)]],
+                                     SynArgInfo ([], false, None)), None),
+                               LongIdent
+                                 (SynLongIdent
+                                    ([this; MyWriteOnlyProperty],
+                                     [/root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,15--3,16)],
+                                     [None; None]), Some set, None,
+                                  Pats
+                                    [Paren
+                                       (Named
+                                          (SynIdent (value, None), false, None,
+                                           /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,46--3,51)),
+                                        /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,45--3,52))],
+                                  None,
+                                  /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,41--3,52)),
+                               None,
+                               LongIdentSet
+                                 (SynLongIdent ([myInternalValue], [], [None]),
+                                  Ident value,
+                                  /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,55--3,79)),
+                               /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,41--3,52),
+                               NoneAtInvisible,
+                               { LeadingKeyword =
+                                  Member
+                                    /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,10)
+                                 InlineKeyword = None
+                                 EqualsRange =
+                                  Some
+                                    /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,53--3,54) })),
+                         /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,79),
+                         { InlineKeyword = None
+                           WithKeyword =
+                            /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,36--3,40)
+                           GetKeyword = None
+                           AndKeyword = None
+                           SetKeyword =
+                            Some
+                              /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,41--3,44) })],
+                     /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,79)),
+                  [],
+                  Some
+                    (ImplicitCtor
+                       (None, [],
+                        SimplePats
+                          ([],
+                           /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                        None,
+                        PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                        { AsKeyword = None })),
+                  /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--3,79),
+                  { LeadingKeyword =
+                     Type
+                       /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                    EqualsRange =
+                     Some
+                       /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,11--1,12)
+                    WithKeyword = None })],
+              /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--3,79))],
+          PreXmlDocEmpty, [], None,
+          /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--3,79),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,4--2,29)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_LINE_.fs b/tests/service/data/SyntaxTree/_LINE_.fs
new file mode 100644
index 00000000000..31814dce1c1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/_LINE_.fs
@@ -0,0 +1 @@
+__LINE__
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_LINE_.fs.bsl b/tests/service/data/SyntaxTree/_LINE_.fs.bsl
new file mode 100644
index 00000000000..f87d3554cb6
--- /dev/null
+++ b/tests/service/data/SyntaxTree/_LINE_.fs.bsl
@@ -0,0 +1,13 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/_LINE_.fs", false, QualifiedNameOfFile _LINE_, [], [],
+      [SynModuleOrNamespace
+         ([_LINE_], false, AnonModule,
+          [Expr
+             (Const
+                (SourceIdentifier ("__LINE__", "1", /root/_LINE_.fs (1,0--1,8)),
+                 /root/_LINE_.fs (1,0--1,8)), /root/_LINE_.fs (1,0--1,8))],
+          PreXmlDocEmpty, [], None, /root/_LINE_.fs (1,0--1,8),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs b/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs
new file mode 100644
index 00000000000..5be6362aebb
--- /dev/null
+++ b/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs
@@ -0,0 +1 @@
+__SOURCE_DIRECTORY__
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl b/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl
new file mode 100644
index 00000000000..99758dd59d1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl
@@ -0,0 +1,16 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/_SOURCEDIRECTORY_.fs", false, QualifiedNameOfFile _SOURCEDIRECTORY_,
+      [], [],
+      [SynModuleOrNamespace
+         ([_SOURCEDIRECTORY_], false, AnonModule,
+          [Expr
+             (Const
+                (SourceIdentifier
+                   ("__SOURCE_DIRECTORY__", "C:\root",
+                    /root/_SOURCEDIRECTORY_.fs (1,0--1,20)),
+                 /root/_SOURCEDIRECTORY_.fs (1,0--1,20)),
+              /root/_SOURCEDIRECTORY_.fs (1,0--1,20))], PreXmlDocEmpty, [], None,
+          /root/_SOURCEDIRECTORY_.fs (1,0--1,20), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_SOURCEFILE_.fs b/tests/service/data/SyntaxTree/_SOURCEFILE_.fs
new file mode 100644
index 00000000000..7bde7cfe7bf
--- /dev/null
+++ b/tests/service/data/SyntaxTree/_SOURCEFILE_.fs
@@ -0,0 +1 @@
+__SOURCE_FILE__
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_SOURCEFILE_.fs.bsl b/tests/service/data/SyntaxTree/_SOURCEFILE_.fs.bsl
new file mode 100644
index 00000000000..afd482a3582
--- /dev/null
+++ b/tests/service/data/SyntaxTree/_SOURCEFILE_.fs.bsl
@@ -0,0 +1,15 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/_SOURCEFILE_.fs", false, QualifiedNameOfFile _SOURCEFILE_, [], [],
+      [SynModuleOrNamespace
+         ([_SOURCEFILE_], false, AnonModule,
+          [Expr
+             (Const
+                (SourceIdentifier
+                   ("__SOURCE_FILE__", "_SOURCEFILE_.fs",
+                    /root/_SOURCEFILE_.fs (1,0--1,15)),
+                 /root/_SOURCEFILE_.fs (1,0--1,15)),
+              /root/_SOURCEFILE_.fs (1,0--1,15))], PreXmlDocEmpty, [], None,
+          /root/_SOURCEFILE_.fs (1,0--1,15), { LeadingKeyword = None })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file

From 4f0c7912995fe7f9f7294772dd30c426e7e53ba0 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Thu, 9 Feb 2023 11:04:57 +0100
Subject: [PATCH 2/8] Remove ported tests.

---
 .../FSharp.Compiler.Service.Tests.fsproj      |  90 ---
 .../service/SyntaxTreeTests/AttributeTests.fs |  50 --
 tests/service/SyntaxTreeTests/BindingTests.fs | 482 ---------------
 .../SyntaxTreeTests/CodeCommentTests.fs       | 146 -----
 .../ComputationExpressionTests.fs             |  57 --
 .../ConditionalDirectiveTests.fs              | 357 -----------
 .../service/SyntaxTreeTests/EnumCaseTests.fs  |  75 ---
 .../service/SyntaxTreeTests/ExceptionTests.fs |  25 -
 .../SyntaxTreeTests/ExpressionTests.fs        | 518 ----------------
 tests/service/SyntaxTreeTests/ExternTests.fs  |  21 -
 .../SyntaxTreeTests/IfThenElseTests.fs        | 177 ------
 tests/service/SyntaxTreeTests/LambdaTests.fs  | 146 -----
 .../SyntaxTreeTests/LeadingKeywordTests.fs    | 561 -----------------
 .../SyntaxTreeTests/MatchClauseTests.fs       | 231 -------
 tests/service/SyntaxTreeTests/MeasureTests.fs | 125 ----
 .../SyntaxTreeTests/MemberFlagTests.fs        | 185 ------
 tests/service/SyntaxTreeTests/MemberTests.fs  | 387 ------------
 .../ModuleOrNamespaceSigTests.fs              |  93 ---
 .../SyntaxTreeTests/ModuleOrNamespaceTests.fs | 140 -----
 .../SyntaxTreeTests/NestedModuleTests.fs      | 172 ------
 .../SyntaxTreeTests/OperatorNameTests.fs      | 486 ---------------
 .../ParsedHashDirectiveTests.fs               |  61 --
 tests/service/SyntaxTreeTests/PatternTests.fs | 140 -----
 .../SyntaxTreeTests/SignatureTypeTests.fs     | 566 ------------------
 .../SyntaxTreeTests/SourceIdentifierTests.fs  |  48 --
 tests/service/SyntaxTreeTests/StringTests.fs  | 121 ----
 .../service/SyntaxTreeTests/SynIdentTests.fs  |  31 -
 tests/service/SyntaxTreeTests/SynTypeTests.fs | 207 -------
 tests/service/SyntaxTreeTests/TypeTests.fs    | 432 -------------
 .../service/SyntaxTreeTests/UnionCaseTests.fs | 165 -----
 tests/service/SyntaxTreeTests/ValTests.fs     |  20 -
 31 files changed, 6315 deletions(-)
 delete mode 100644 tests/service/SyntaxTreeTests/AttributeTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/BindingTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/CodeCommentTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/ComputationExpressionTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/ConditionalDirectiveTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/EnumCaseTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/ExceptionTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/ExpressionTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/ExternTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/IfThenElseTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/LambdaTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/LeadingKeywordTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/MatchClauseTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/MeasureTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/MemberFlagTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/MemberTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/ModuleOrNamespaceSigTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/ModuleOrNamespaceTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/NestedModuleTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/OperatorNameTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/ParsedHashDirectiveTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/PatternTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/SignatureTypeTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/SourceIdentifierTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/StringTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/SynIdentTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/SynTypeTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/TypeTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/UnionCaseTests.fs
 delete mode 100644 tests/service/SyntaxTreeTests/ValTests.fs

diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
index 1876c8e247a..d4d24ac98ec 100644
--- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
+++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
@@ -43,96 +43,6 @@
     <Compile Include="ConsoleOnlyOptionsTests.fs" />
     <Compile Include="VisualStudioVersusConsoleContextTests.fs" />
     <Compile Include="..\service\SyntaxTreeTests.fs" />
-    <Compile Include="..\service\SyntaxTreeTests\TypeTests.fs">
-      <Link>SyntaxTree\TypeTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\ExpressionTests.fs">
-      <Link>SyntaxTree\ExpressionTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\StringTests.fs">
-      <Link>SyntaxTree\StringTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\ModuleOrNamespaceTests.fs">
-      <Link>SyntaxTree\ModuleOrNamespaceTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\ModuleOrNamespaceSigTests.fs">
-      <Link>SyntaxTree\ModuleOrNamespaceSigTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\SignatureTypeTests.fs">
-      <Link>SyntaxTree\SignatureTypeTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\MeasureTests.fs">
-      <Link>SyntaxTree\MeasureTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\MatchClauseTests.fs">
-      <Link>SyntaxTree\MatchClauseTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\SourceIdentifierTests.fs">
-      <Link>SyntaxTree\SourceIdentifierTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\NestedModuleTests.fs">
-      <Link>SyntaxTree\NestedModuleTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\BindingTests.fs">
-      <Link>SyntaxTree\BindingTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\ParsedHashDirectiveTests.fs">
-      <Link>SyntaxTree\ParsedHashDirectiveTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\LambdaTests.fs">
-      <Link>SyntaxTree\LambdaTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\IfThenElseTests.fs">
-      <Link>SyntaxTree\IfThenElseTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\UnionCaseTests.fs">
-      <Link>SyntaxTree\UnionCaseTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\EnumCaseTests.fs">
-      <Link>SyntaxTree\EnumCaseTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\PatternTests.fs">
-      <Link>SyntaxTree\PatternTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\ExceptionTests.fs">
-      <Link>SyntaxTree\ExceptionTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\MemberFlagTests.fs">
-      <Link>SyntaxTree\MemberFlagTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\MemberTests.fs">
-      <Link>SyntaxTree\MemberTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\ComputationExpressionTests.fs">
-      <Link>SyntaxTree\ComputationExpressionTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\ConditionalDirectiveTests.fs">
-      <Link>SyntaxTree\ConditionalDirectiveTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\CodeCommentTests.fs">
-      <Link>SyntaxTree\CodeCommentTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\OperatorNameTests.fs">
-      <Link>SyntaxTree\OperatorNameTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\SynIdentTests.fs">
-      <Link>SyntaxTree\SynIdentTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\SynTypeTests.fs">
-      <Link>SyntaxTree\SynTypeTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\AttributeTests.fs">
-      <Link>SyntaxTree\AttributeTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\ExternTests.fs">
-      <Link>SyntaxTree\ExternTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\LeadingKeywordTests.fs">
-      <Link>SyntaxTree\LeadingKeywordTests.fs</Link>
-    </Compile>
-    <Compile Include="..\service\SyntaxTreeTests\ValTests.fs">
-      <Link>SyntaxTree\ValTests.fs</Link>
-    </Compile>
     <Compile Include="..\service\FileSystemTests.fs">
       <Link>FileSystemTests.fs</Link>
     </Compile>
diff --git a/tests/service/SyntaxTreeTests/AttributeTests.fs b/tests/service/SyntaxTreeTests/AttributeTests.fs
deleted file mode 100644
index c31aefae85f..00000000000
--- a/tests/service/SyntaxTreeTests/AttributeTests.fs
+++ /dev/null
@@ -1,50 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.AttributeTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-
-[<Test>]
-let ``range of attribute`` () =
-    let ast =
-        """
-[<MyAttribute(foo ="bar")>]
-do ()
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile (ParsedImplFileInput(contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls =
-        [ SynModuleDecl.Attributes(attributes = [ { Attributes = [ { Range = mAttribute } ] } ]) ; SynModuleDecl.Expr _ ] ) ]))  ->
-        assertRange (2, 2) (2, 25) mAttribute
-    | _ -> Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``range of attribute with path`` () =
-    let ast =
-        """
-[<Prefix.MyAttribute(foo ="bar")>]
-do ()
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile (ParsedImplFileInput(contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls =
-        [ SynModuleDecl.Attributes(attributes = [ { Attributes = [ { Range = mAttribute } ] } ]) ; SynModuleDecl.Expr _ ] ) ]))  ->
-        assertRange (2, 2) (2, 32) mAttribute
-    | _ -> Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``range of attribute with target`` () =
-    let ast =
-        """
-[<assembly: MyAttribute(foo ="bar")>]
-do ()
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile (ParsedImplFileInput(contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls =
-        [ SynModuleDecl.Attributes(attributes = [ { Attributes = [ { Range = mAttribute } ] } ]) ; SynModuleDecl.Expr _ ] ) ]))  ->
-        assertRange (2, 2) (2, 35) mAttribute
-    | _ -> Assert.Fail $"Could not get valid AST, got {ast}"
diff --git a/tests/service/SyntaxTreeTests/BindingTests.fs b/tests/service/SyntaxTreeTests/BindingTests.fs
deleted file mode 100644
index ef6efe22230..00000000000
--- a/tests/service/SyntaxTreeTests/BindingTests.fs
+++ /dev/null
@@ -1,482 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.BindingTestsTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-[<Test>]
-let ``Range of attribute should be included in SynModuleDecl.Let`` () =
-    let parseResults = 
-        getParseResults
-            """
-[<Foo>]
-let a = 0"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [SynBinding(range = mb)]) as lt
-    ]) ])) ->
-        assertRange (2, 0) (3, 5) mb
-        assertRange (2, 0) (3, 9) lt.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute between let keyword and pattern should be included in SynModuleDecl.Let`` () =
-    let parseResults = 
-        getParseResults
-            """
-let [<Literal>] (A x) = 1"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [SynBinding(range = mb)]) as lt
-    ]) ])) ->
-        assertRange (2, 4) (2, 21) mb
-        assertRange (2, 0) (2, 25) lt.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute should be included in SynMemberDefn.LetBindings`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Bar =
-    [<Foo>]
-    let x = 8"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [SynMemberDefn.LetBindings(bindings = [SynBinding(range = mb)]) as m]))])
-    ]) ])) ->
-        assertRange (3, 4) (4, 9) mb
-        assertRange (3, 4) (4, 13) m.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute should be included in SynMemberDefn.Member`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Bar =
-    [<Foo>]
-    member this.Something () = ()"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [SynMemberDefn.Member(memberDefn = SynBinding(range = mb)) as m]))])
-    ]) ])) ->
-        assertRange (3, 4) (4, 28) mb
-        assertRange (3, 4) (4, 33) m.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute should be included in binding of SynExpr.ObjExpr`` () =
-    let parseResults = 
-        getParseResults
-            """
-{ new System.Object() with
-    [<Foo>]
-    member x.ToString() = "F#" }"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.ObjExpr(members = [SynMemberDefn.Member(memberDefn=SynBinding(range = mb))]))
-    ]) ])) ->
-        assertRange (3, 4) (4, 23) mb
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute should be included in constructor SynMemberDefn.Member`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Tiger =
-    [<Foo>]
-    new () = ()"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [SynMemberDefn.Member(memberDefn = SynBinding(range = mb)) as m]))])
-    ]) ])) ->
-        assertRange (3, 4) (4, 10) mb
-        assertRange (3, 4) (4, 15) m.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute should be included in constructor SynMemberDefn.Member, optAsSpec`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Tiger =
-    [<Foo>]
-    new () as tony = ()"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [SynMemberDefn.Member(memberDefn = SynBinding(range = mb)) as m]))])
-    ]) ])) ->
-        assertRange (3, 4) (4, 18) mb
-        assertRange (3, 4) (4, 23) m.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute should be included in secondary constructor`` () =
-    let parseResults = 
-        getParseResults
-            """
-type T() =
-    new () =
-        T ()
-
-    internal new () =
-        T ()
-
-    [<Foo>]
-    new () =
-        T ()"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-            SynMemberDefn.ImplicitCtor _
-            SynMemberDefn.Member(memberDefn = SynBinding(range = mb1)) as m1
-            SynMemberDefn.Member(memberDefn = SynBinding(range = mb2)) as m2
-            SynMemberDefn.Member(memberDefn = SynBinding(range = mb3)) as m3
-        ]))])
-    ]) ])) ->
-        assertRange (3, 4) (3, 10) mb1
-        assertRange (3, 4) (4, 12) m1.Range
-        assertRange (6, 4) (6, 19) mb2
-        assertRange (6, 4) (7, 12) m2.Range
-        assertRange (9, 4) (10, 10) mb3
-        assertRange (9, 4) (11, 12) m3.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute should be included in write only SynMemberDefn.Member property`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Crane =
-    [<Foo>]
-    member this.MyWriteOnlyProperty with set (value) = myInternalValue <- value"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members =
-            [SynMemberDefn.GetSetMember(memberDefnForSet = Some (SynBinding(range = mb))) as m]))])
-    ]) ])) ->
-        assertRange (3, 4) (4, 52) mb
-        assertRange (3, 4) (4, 79) m.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute should be included in full SynMemberDefn.Member property`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Bird =
-    [<Foo>]
-    member this.TheWord
-        with get () = myInternalValue
-        and set (value) = myInternalValue <- value"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-            SynMemberDefn.GetSetMember(Some (SynBinding(range = mb1)), Some (SynBinding(range = mb2)), m, _)
-        ]))])
-    ]) ])) ->
-        assertRange (3, 4) (5, 19) mb1
-        assertRange (3, 4) (6, 23) mb2
-        assertRange (3, 4) (6, 50) m
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of equal sign should be present in SynModuleDecl.Let binding`` () =
-    let parseResults = 
-        getParseResults "let v = 12"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [SynBinding(trivia={ EqualsRange = Some mEquals })])
-    ]) ])) ->
-        assertRange (1, 6) (1, 7) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of equal sign should be present in SynModuleDecl.Let binding, typed`` () =
-    let parseResults = 
-        getParseResults "let v : int = 12"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [SynBinding(trivia={ EqualsRange = Some mEquals })])
-    ]) ])) ->
-        assertRange (1, 12) (1, 13) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of equal sign should be present in local Let binding`` () =
-    let parseResults = 
-        getParseResults
-            """
-do
-    let z = 2
-    ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.Do(expr = SynExpr.LetOrUse(bindings = [SynBinding(trivia={ EqualsRange = Some mEquals })])))
-    ]) ])) ->
-        assertRange (3, 10) (3, 11) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of equal sign should be present in local Let binding, typed`` () =
-    let parseResults = 
-        getParseResults
-            """
-do
-    let z: int = 2
-    ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.Do(expr = SynExpr.LetOrUse(bindings = [SynBinding(trivia={ EqualsRange = Some mEquals })])))
-    ]) ])) ->
-        assertRange (3, 15) (3, 16) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of equal sign should be present in member binding`` () =
-    let parseResults = 
-        getParseResults
-            """
-type X() =
-    member this.Y = z
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [ _; SynMemberDefn.Member(memberDefn = SynBinding(trivia={ EqualsRange = Some mEquals }))]))])
-    ]) ])) ->
-        assertRange (3, 18) (3, 19) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of equal sign should be present in member binding, with parameters`` () =
-    let parseResults = 
-        getParseResults
-            """
-type X() =
-    member this.Y () = z
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [ _; SynMemberDefn.Member(memberDefn = SynBinding(trivia={ EqualsRange = Some mEquals }))]))])
-    ]) ])) ->
-        assertRange (3, 21) (3, 22) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of equal sign should be present in member binding, with return type`` () =
-    let parseResults = 
-        getParseResults
-            """
-type X() =
-    member this.Y () : string = z
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [ _; SynMemberDefn.Member(memberDefn = SynBinding(trivia={ EqualsRange = Some mEquals }))]))])
-    ]) ])) ->
-        assertRange (3, 30) (3, 31) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of equal sign should be present in property`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Y() =
-    member this.MyReadWriteProperty
-        with get () = myInternalValue
-        and set (value) = myInternalValue <- value
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-            _
-            SynMemberDefn.GetSetMember(
-                Some(SynBinding(trivia={ EqualsRange = Some eqGetM })),
-                Some(SynBinding(trivia={ EqualsRange = Some eqSetM })), _, _)
-        ]))])
-    ]) ])) ->
-        assertRange (4, 20) (4, 21) eqGetM
-        assertRange (5, 24) (5, 25) eqSetM
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of let keyword should be present in SynModuleDecl.Let binding`` () =
-    let parseResults = 
-        getParseResults "let v = 12"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [SynBinding(trivia={ LeadingKeyword = SynLeadingKeyword.Let mLet })])
-    ]) ])) ->
-        assertRange (1, 0) (1, 3) mLet
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of let keyword should be present in SynModuleDecl.Let binding with attributes`` () =
-    let parseResults = 
-        getParseResults """
-/// XmlDoc
-[<SomeAttribute>]
-// some comment
-let v = 12
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [SynBinding(trivia={ LeadingKeyword = SynLeadingKeyword.Let mLet })])
-    ]) ])) ->
-        assertRange (5, 0) (5, 3) mLet
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of let keyword should be present in SynExpr.LetOrUse binding`` () =
-    let parseResults = 
-        getParseResults """
-let a =
-    let b c = d
-    ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [SynBinding(expr=SynExpr.LetOrUse(bindings=[SynBinding(trivia={ LeadingKeyword = SynLeadingKeyword.Let mLet })]))])
-    ]) ])) ->
-        assertRange (3, 4) (3, 7) mLet
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Tuple return type of binding should contain stars`` () =
-    let parseResults = 
-        getParseResults """
-let a : int * string = failwith "todo"
-let b : int * string * bool = 1, "", false
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [
-            SynBinding(returnInfo =
-                Some (SynBindingReturnInfo(typeName = SynType.Tuple(path = [
-                    SynTupleTypeSegment.Type _
-                    SynTupleTypeSegment.Star _
-                    SynTupleTypeSegment.Type _
-                ]))))
-        ])
-        SynModuleDecl.Let(bindings = [
-            SynBinding(returnInfo =
-                Some (SynBindingReturnInfo(typeName = SynType.Tuple(path = [
-                    SynTupleTypeSegment.Type _
-                    SynTupleTypeSegment.Star _
-                    SynTupleTypeSegment.Type _
-                    SynTupleTypeSegment.Star _
-                    SynTupleTypeSegment.Type _
-                ]))))
-        ])
-    ]) ])) ->
-        Assert.Pass ()
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``Colon before return type is part of trivia`` () =
-    let parseResults = 
-        getParseResults """
-let x y : int = failwith "todo"
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [
-            SynBinding(returnInfo =
-                Some (SynBindingReturnInfo(trivia = { ColonRange = Some mColon })))
-        ])
-    ]) ])) ->
-        assertRange (2,8) (2,9) mColon
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``Colon before return type is part of trivia in properties`` () =
-    let parseResults = 
-        getParseResults """
-type X =
-    member this.Y with get():int = 1 and set (_:int):unit = ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [
-            SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                SynMemberDefn.GetSetMember(
-                    memberDefnForGet = Some(SynBinding(returnInfo = Some (SynBindingReturnInfo(trivia = { ColonRange = Some mColon1 }))))
-                    memberDefnForSet = Some(SynBinding(returnInfo = Some (SynBindingReturnInfo(trivia = { ColonRange = Some mColon2 }))))
-                )
-            ]))
-        ])
-    ]) ])) ->
-        assertRange (3,28) (3,29) mColon1
-        assertRange (3,52) (3,53) mColon2
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``Inline keyword in binding`` () =
-    let parseResults = 
-        getParseResults """
-let inline x y z =
-    let inline a b c = ()
-    ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [
-            SynBinding(trivia = { InlineKeyword = Some mInline1 }
-                       expr = SynExpr.LetOrUse(bindings = [
-                           SynBinding(trivia = { InlineKeyword = Some mInline2 })
-                       ]))
-        ])
-    ]) ])) ->
-        assertRange (2,4) (2,10) mInline1
-        assertRange (3,8) (3,14) mInline2
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``Conditional directive around inline keyword`` () =
-    let parseResults = 
-        getParseResults """
-let 
-#if !FOO
-    inline
-#endif
-    map f ar = Async.map (Result.map f) ar
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [
-            SynBinding(trivia = { InlineKeyword = Some mInline }) ])
-    ]) ])) ->
-        assertRange (4,4) (4,10) mInline
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
diff --git a/tests/service/SyntaxTreeTests/CodeCommentTests.fs b/tests/service/SyntaxTreeTests/CodeCommentTests.fs
deleted file mode 100644
index ce25783eecf..00000000000
--- a/tests/service/SyntaxTreeTests/CodeCommentTests.fs
+++ /dev/null
@@ -1,146 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.CodeCommentTestsTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-let private getCommentTrivia isSignatureFile source =
-    let ast = (if isSignatureFile then getParseResultsOfSignatureFile else getParseResults) source
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(trivia = { CodeComments = trivia }))
-    | ParsedInput.SigFile(ParsedSigFileInput(trivia = { CodeComments = trivia })) -> trivia
-
-[<Test>]
-let ``comment on single line`` () =
-    let trivia =
-        getCommentTrivia false """
-// comment!
-foo()
-"""
-
-    match trivia with
-    | [ CommentTrivia.LineComment mComment ] ->
-        assertRange (2, 0) (2, 11) mComment
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``comment on single line, signature file`` () =
-    let trivia =
-        getCommentTrivia true """
-namespace Meh
-// comment!
-foo()
-"""
-
-    match trivia with
-    | [ CommentTrivia.LineComment mComment ] ->
-        assertRange (3, 0) (3, 11) mComment
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``comment after source code`` () =
-    let trivia =
-        getCommentTrivia false """
-foo() // comment!
-"""
-
-    match trivia with
-    | [ CommentTrivia.LineComment mComment ] ->
-        assertRange (2, 6) (2, 17) mComment
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``comment after source code, signature file`` () =
-    let trivia =
-        getCommentTrivia true """
-namespace Meh
-
-val foo : int // comment!
-"""
-
-    match trivia with
-    | [ CommentTrivia.LineComment mComment ] ->
-        assertRange (4, 14) (4, 25) mComment
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``block comment in source code`` () =
-    let trivia =
-        getCommentTrivia false """
-let a (* b *)  c = c + 42
-"""
-
-    match trivia with
-    | [ CommentTrivia.BlockComment mComment ] ->
-        assertRange (2, 6) (2, 13) mComment
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``block comment in source code, signature file`` () =
-    let trivia =
-        getCommentTrivia true """
-namespace Meh
-
-val a (* b *) : int
-"""
-
-    match trivia with
-    | [ CommentTrivia.BlockComment mComment ] ->
-        assertRange (4, 6) (4, 13) mComment
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``comment at end of file`` () =
-    let trivia =
-        getCommentTrivia false "x // y"
-
-    match trivia with
-    | [ CommentTrivia.LineComment mComment ] ->
-        assertRange (1, 2) (1, 6) mComment
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``triple slash comment should not be captured`` () =
-    let trivia =
-        getCommentTrivia false """
-/// Some great documentation comment
-let x = 0
-"""
-
-    match trivia with
-    | [] ->
-        Assert.Pass()
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``triple slash comment should be captured, if used in an invalid location`` () =
-    let trivia =
-        getCommentTrivia false """
-/// Valid xml doc
-let x =
-    /// Some great documentation comment
-
-    /// With a blank line in between
-    /// but on a while loop
-    while true do ()
-    a + 1
-"""
-
-    match trivia with
-    | [ CommentTrivia.LineComment m1
-        CommentTrivia.LineComment m2
-        CommentTrivia.LineComment m3 ] ->
-        assertRange (4, 4) (4, 40) m1
-        assertRange (6, 4) (6, 36) m2
-        assertRange (7, 4) (7, 27) m3
-    | _ ->
-        Assert.Fail "Could not get valid AST"
\ No newline at end of file
diff --git a/tests/service/SyntaxTreeTests/ComputationExpressionTests.fs b/tests/service/SyntaxTreeTests/ComputationExpressionTests.fs
deleted file mode 100644
index 243a06165c8..00000000000
--- a/tests/service/SyntaxTreeTests/ComputationExpressionTests.fs
+++ /dev/null
@@ -1,57 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.ComputationExpressionTestsTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-
-[<Test>]
-let ``SynExprAndBang range starts at and! and ends after expression`` () =
-    let ast =
-        getParseResults """
-async {
-    let! bar = getBar ()
-
-    and! foo = getFoo ()
-
-    return bar
-}
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Expr (expr = SynExpr.App(argExpr = SynExpr.ComputationExpr(expr = SynExpr.LetOrUseBang(andBangs = [
-                SynExprAndBang(range = mAndBang)
-                ]))))
-            ])
-        ])) ->
-        assertRange (5, 4) (5, 24) mAndBang
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``multiple SynExprAndBang have range that starts at and! and ends after expression`` () =
-    let ast =
-        getParseResults """
-async {
-    let! bar = getBar ()
-    and! foo = getFoo () in
-    and! meh = getMeh ()
-    return bar
-}
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Expr (expr = SynExpr.App(argExpr = SynExpr.ComputationExpr(expr = SynExpr.LetOrUseBang(andBangs = [
-                SynExprAndBang(range = mAndBang1; trivia={ InKeyword = Some mIn })
-                SynExprAndBang(range = mAndBang2)
-                ]))))
-            ])
-        ])) ->
-        assertRange (4, 4) (4, 24) mAndBang1
-        assertRange (4, 25) (4, 27) mIn
-        assertRange (5, 4) (5, 24) mAndBang2
-    | _ ->
-        Assert.Fail "Could not get valid AST"
\ No newline at end of file
diff --git a/tests/service/SyntaxTreeTests/ConditionalDirectiveTests.fs b/tests/service/SyntaxTreeTests/ConditionalDirectiveTests.fs
deleted file mode 100644
index b48262d370b..00000000000
--- a/tests/service/SyntaxTreeTests/ConditionalDirectiveTests.fs
+++ /dev/null
@@ -1,357 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.ConditionalDirectiveTestsTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-let private getDirectiveTrivia isSignatureFile source =
-    let ast = (if isSignatureFile then getParseResultsOfSignatureFile else getParseResults) source
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(trivia = { ConditionalDirectives = trivia }))
-    | ParsedInput.SigFile(ParsedSigFileInput(trivia = { ConditionalDirectives = trivia })) -> trivia
-
-[<Test>]
-let ``single #if / #endif`` () =
-    let trivia =
-        getDirectiveTrivia false """
-let v =
-    #if DEBUG
-    ()
-    #endif
-    42
-"""
-
-    match trivia with
-    | [ ConditionalDirectiveTrivia.If(expr, mIf)
-        ConditionalDirectiveTrivia.EndIf mEndif ] ->
-        assertRange (3, 4) (3, 13) mIf
-        assertRange (5, 4) (5, 10) mEndif
-        
-        match expr with
-        | IfDirectiveExpression.Ident "DEBUG" -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr}"
-    | _ ->
-        Assert.Fail $"Unexpected trivia, got {trivia}"
-
-[<Test>]
-let ``single #if / #else / #endif`` () =
-    let trivia =
-        getDirectiveTrivia false """
-let v =
-    #if DEBUG
-    30
-    #else
-    42
-    #endif
-"""
-
-    match trivia with
-    | [ ConditionalDirectiveTrivia.If(expr, mIf)
-        ConditionalDirectiveTrivia.Else mElse
-        ConditionalDirectiveTrivia.EndIf mEndif ] ->
-        assertRange (3, 4) (3, 13) mIf
-        assertRange (5, 4) (5, 9) mElse
-        assertRange (7, 4) (7, 10) mEndif
-        
-        match expr with
-        | IfDirectiveExpression.Ident "DEBUG" -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr}"
-    | _ ->
-        Assert.Fail $"Unexpected trivia, got {trivia}"
-
-[<Test>]
-let ``nested #if / #else / #endif`` () =
-    let trivia =
-        getDirectiveTrivia false """
-let v =
-    #if FOO
-        #if MEH
-        1
-        #else
-        2
-        #endif
-    #else
-        3
-    #endif
-"""
-
-    match trivia with
-    | [ ConditionalDirectiveTrivia.If(expr1, mIf1)
-        ConditionalDirectiveTrivia.If(expr2, mIf2)
-        ConditionalDirectiveTrivia.Else mElse1
-        ConditionalDirectiveTrivia.EndIf mEndif1
-        ConditionalDirectiveTrivia.Else mElse2
-        ConditionalDirectiveTrivia.EndIf mEndif2 ] ->
-        assertRange (3, 4) (3, 11) mIf1
-        assertRange (4, 8) (4, 15) mIf2
-        assertRange (6, 8) (6, 13) mElse1
-        assertRange (8, 8) (8, 14) mEndif1
-        assertRange (9, 4) (9, 9) mElse2
-        assertRange (11, 4) (11, 10) mEndif2
-        
-        match expr1 with
-        | IfDirectiveExpression.Ident "FOO" -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr1}"
-
-        match expr2 with
-        | IfDirectiveExpression.Ident "MEH" -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr2}"
-    | _ ->
-        Assert.Fail $"Unexpected trivia, got {trivia}"
-
-[<Test>]
-let ``nested #if / #endif with complex expressions`` () =
-    let trivia =
-        getDirectiveTrivia false """
-let v =
-    #if !DEBUG
-        #if FOO && BAR
-            #if MEH || HMM
-                printfn "oh some logging"
-            #endif
-        #endif
-    #endif
-"""
-
-    match trivia with
-    | [ ConditionalDirectiveTrivia.If(expr1, mIf1)
-        ConditionalDirectiveTrivia.If(expr2, mIf2)
-        ConditionalDirectiveTrivia.If(expr3, mIf3)
-        ConditionalDirectiveTrivia.EndIf mEndif1
-        ConditionalDirectiveTrivia.EndIf mEndif2
-        ConditionalDirectiveTrivia.EndIf mEndif3 ] ->
-        assertRange (3, 4) (3, 14) mIf1
-        assertRange (4, 8) (4, 22) mIf2
-        assertRange (5, 12) (5, 26) mIf3
-        assertRange (7, 12) (7, 18) mEndif1
-        assertRange (8, 8) (8, 14) mEndif2
-        assertRange (9, 4) (9, 10) mEndif3
-        
-        match expr1 with
-        | IfDirectiveExpression.Not (IfDirectiveExpression.Ident "DEBUG") -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr1}"
-
-        match expr2 with
-        | IfDirectiveExpression.And(IfDirectiveExpression.Ident "FOO", IfDirectiveExpression.Ident "BAR") -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr2}"
-
-        match expr3 with
-        | IfDirectiveExpression.Or(IfDirectiveExpression.Ident "MEH", IfDirectiveExpression.Ident "HMM") -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr3}"
-    | _ ->
-        Assert.Fail $"Unexpected trivia, got {trivia}"
-
-[<Test>]
-let ``directives in multiline comment are not reported as trivia`` () =
-    let trivia =
-        getDirectiveTrivia false """
-let v =
-(*
-#if DEBUG
-()
-#endif
-*)
-42
-"""
-
-    match trivia with
-    | [] -> Assert.Pass()
-    | _ ->
-        Assert.Fail $"Unexpected trivia, got {trivia}"
-
-[<Test>]
-let ``directives in multiline string are not reported as trivia`` () =
-    let trivia =
-        getDirectiveTrivia false "
-let v = \"\"\"
-#if DEBUG
-()
-#endif
-42
-\"\"\"
-"
-
-    match trivia with
-    | [] -> Assert.Pass()
-    | _ ->
-        Assert.Fail $"Unexpected trivia, got {trivia}"
-
-[<Test>]
-let ``single #if / #endif, signature file`` () =
-    let trivia =
-        getDirectiveTrivia true """
-namespace Foobar
-
-val v: int =
-    #if DEBUG
-    1
-    #endif
-    42
-"""
-
-    match trivia with
-    | [ ConditionalDirectiveTrivia.If(expr, mIf)
-        ConditionalDirectiveTrivia.EndIf mEndif ] ->
-        assertRange (5, 4) (5, 13) mIf
-        assertRange (7, 4) (7, 10) mEndif
-        
-        match expr with
-        | IfDirectiveExpression.Ident "DEBUG" -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr}"
-    | _ ->
-        Assert.Fail $"Unexpected trivia, got {trivia}"
-
-[<Test>]
-let ``single #if / #else / #endif, signature file`` () =
-    let trivia =
-        getDirectiveTrivia true """
-namespace Foobar
-
-val v : int =
-    #if DEBUG
-    30
-    #else
-    42
-    #endif
-"""
-
-    match trivia with
-    | [ ConditionalDirectiveTrivia.If(expr, mIf)
-        ConditionalDirectiveTrivia.Else mElse
-        ConditionalDirectiveTrivia.EndIf mEndif ] ->
-        assertRange (5, 4) (5, 13) mIf
-        assertRange (7, 4) (7, 9) mElse
-        assertRange (9, 4) (9, 10) mEndif
-        
-        match expr with
-        | IfDirectiveExpression.Ident "DEBUG" -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr}"
-    | _ ->
-        Assert.Fail $"Unexpected trivia, got {trivia}"
-
-[<Test>]
-let ``nested #if / #else / #endif, signature file`` () =
-    let trivia =
-        getDirectiveTrivia true """
-namespace Foobar
-
-val v : int =
-    #if FOO
-        #if MEH
-        1
-        #else
-        2
-        #endif
-    #else
-        3
-    #endif
-"""
-
-    match trivia with
-    | [ ConditionalDirectiveTrivia.If(expr1, mIf1)
-        ConditionalDirectiveTrivia.If(expr2, mIf2)
-        ConditionalDirectiveTrivia.Else mElse1
-        ConditionalDirectiveTrivia.EndIf mEndif1
-        ConditionalDirectiveTrivia.Else mElse2
-        ConditionalDirectiveTrivia.EndIf mEndif2 ] ->
-        assertRange (5, 4) (5, 11) mIf1
-        assertRange (6, 8) (6, 15) mIf2
-        assertRange (8, 8) (8, 13) mElse1
-        assertRange (10, 8) (10, 14) mEndif1
-        assertRange (11, 4) (11, 9) mElse2
-        assertRange (13, 4) (13, 10) mEndif2
-        
-        match expr1 with
-        | IfDirectiveExpression.Ident "FOO" -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr1}"
-
-        match expr2 with
-        | IfDirectiveExpression.Ident "MEH" -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr2}"
-    | _ ->
-        Assert.Fail $"Unexpected trivia, got {trivia}"
-
-[<Test>]
-let ``nested #if / #endif with complex expressions, signature file`` () =
-    let trivia =
-        getDirectiveTrivia true """
-namespace Foobar
-
-val v : int =
-    #if !DEBUG
-        #if FOO && BAR
-            #if MEH || HMM
-                9
-            #endif
-        #endif
-    #endif
-    10
-"""
-
-    match trivia with
-    | [ ConditionalDirectiveTrivia.If(expr1, mIf1)
-        ConditionalDirectiveTrivia.If(expr2, mIf2)
-        ConditionalDirectiveTrivia.If(expr3, mIf3)
-        ConditionalDirectiveTrivia.EndIf mEndif1
-        ConditionalDirectiveTrivia.EndIf mEndif2
-        ConditionalDirectiveTrivia.EndIf mEndif3 ] ->
-        assertRange (5, 4) (5, 14) mIf1
-        assertRange (6, 8) (6, 22) mIf2
-        assertRange (7, 12) (7, 26) mIf3
-        assertRange (9, 12) (9, 18) mEndif1
-        assertRange (10, 8) (10, 14) mEndif2
-        assertRange (11, 4) (11, 10) mEndif3
-        
-        match expr1 with
-        | IfDirectiveExpression.Not (IfDirectiveExpression.Ident "DEBUG") -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr1}"
-
-        match expr2 with
-        | IfDirectiveExpression.And(IfDirectiveExpression.Ident "FOO", IfDirectiveExpression.Ident "BAR") -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr2}"
-
-        match expr3 with
-        | IfDirectiveExpression.Or(IfDirectiveExpression.Ident "MEH", IfDirectiveExpression.Ident "HMM") -> ()
-        | _ -> Assert.Fail $"Expected different expression, got {expr3}"
-    | _ ->
-        Assert.Fail $"Unexpected trivia, got {trivia}"
-
-[<Test>]
-let ``directives in multiline comment are not reported as trivia, signature file`` () =
-    let trivia =
-        getDirectiveTrivia true """
-namespace Foobar
-
-val v : int =
-(*
-#if DEBUG
-()
-#endif
-*)
-42
-"""
-
-    match trivia with
-    | [] -> Assert.Pass()
-    | _ ->
-        Assert.Fail $"Unexpected trivia, got {trivia}"
-
-[<Test>]
-let ``directives in multiline string are not reported as trivia, signature file`` () =
-    let trivia =
-        getDirectiveTrivia true "
-namespace Foobar
-
-let v : string = \"\"\"
-#if DEBUG
-()
-#endif
-42
-\"\"\"
-"
-
-    match trivia with
-    | [] -> Assert.Pass()
-    | _ ->
-        Assert.Fail $"Unexpected trivia, got {trivia}"
\ No newline at end of file
diff --git a/tests/service/SyntaxTreeTests/EnumCaseTests.fs b/tests/service/SyntaxTreeTests/EnumCaseTests.fs
deleted file mode 100644
index 1363ab095ac..00000000000
--- a/tests/service/SyntaxTreeTests/EnumCaseTests.fs
+++ /dev/null
@@ -1,75 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.EnumCaseTestsTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-
-[<Test>]
-let ``single SynEnumCase has bar range`` () =
-    let ast = """
-type Foo = | Bar = 1
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types ([
-                SynTypeDefn.SynTypeDefn (typeRepr = SynTypeDefnRepr.Simple (simpleRepr = SynTypeDefnSimpleRepr.Enum(cases = [
-                    SynEnumCase.SynEnumCase (trivia = { BarRange = Some mBar; EqualsRange = mEquals })
-                ])))
-            ], _)
-        ])
-      ])) ->
-        assertRange (2, 11) (2, 12) mBar
-        assertRange (2, 17) (2, 18) mEquals
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``multiple SynEnumCases have bar range`` () =
-    let ast = """
-type Foo =
-    | Bar = 1
-    | Bear = 2
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types ([
-                SynTypeDefn.SynTypeDefn (typeRepr = SynTypeDefnRepr.Simple (simpleRepr = SynTypeDefnSimpleRepr.Enum(cases = [
-                    SynEnumCase.SynEnumCase (trivia = { BarRange = Some mBar1; EqualsRange = mEquals1 })
-                    SynEnumCase.SynEnumCase (trivia = { BarRange = Some mBar2; EqualsRange = mEquals2 })
-                ])))
-            ], _)
-        ])
-      ])) ->
-        assertRange (3, 4) (3, 5) mBar1
-        assertRange (3, 10) (3, 11) mEquals1
-        assertRange (4, 4) (4, 5) mBar2
-        assertRange (4, 11) (4, 12) mEquals2
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``single SynEnumCase without bar`` () =
-    let ast = """
-type Foo = Bar = 1
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types ([
-                SynTypeDefn.SynTypeDefn (typeRepr = SynTypeDefnRepr.Simple (simpleRepr = SynTypeDefnSimpleRepr.Enum(cases = [
-                    SynEnumCase.SynEnumCase (trivia = { BarRange = None; EqualsRange = mEquals })
-                ])))
-            ], _)
-        ])
-      ])) ->
-        assertRange (2, 15) (2, 16) mEquals
-    | _ ->
-        Assert.Fail "Could not get valid AST"
\ No newline at end of file
diff --git a/tests/service/SyntaxTreeTests/ExceptionTests.fs b/tests/service/SyntaxTreeTests/ExceptionTests.fs
deleted file mode 100644
index a712eba5e6f..00000000000
--- a/tests/service/SyntaxTreeTests/ExceptionTests.fs
+++ /dev/null
@@ -1,25 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.ExceptionTestsTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-
-[<Test>]
-let ``SynExceptionDefn should contains the range of the with keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-namespace X
-
-exception Foo with
-    member Meh () = ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace(decls = [
-        SynModuleDecl.Exception(
-            exnDefn=SynExceptionDefn(withKeyword = Some mWithKeyword)
-        )
-    ]) ])) ->
-        assertRange (4, 14) (4, 18) mWithKeyword
-    | _ -> Assert.Fail "Could not get valid AST"
\ No newline at end of file
diff --git a/tests/service/SyntaxTreeTests/ExpressionTests.fs b/tests/service/SyntaxTreeTests/ExpressionTests.fs
deleted file mode 100644
index 83fffdef005..00000000000
--- a/tests/service/SyntaxTreeTests/ExpressionTests.fs
+++ /dev/null
@@ -1,518 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.ExpressionTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-[<Test>]
-let ``SynExpr.Do contains the range of the do keyword`` () =
-    let ast = """let a =
-    do
-        foobar
-    do!
-        foobarBang
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Let(bindings = [
-                        SynBinding(expr = SynExpr.Sequential(expr1 = SynExpr.Do(_, doRange) ; expr2 = SynExpr.DoBang(_, doBangRange)))
-                    ])
-                ])
-            ])) ->
-        assertRange (2, 4) (3, 14) doRange
-        assertRange (4, 4) (5, 18) doBangRange
-    | _ ->
-        Assert.Fail "Could not find SynExpr.Do"
-
-[<Test>]
-let ``SynExpr.LetOrUseBang contains the range of the equals sign`` () =
-    let ast =
-        """
-comp {
-    let! x = y
-    and! z = someFunction ()
-    return ()
-}
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr = SynExpr.App(argExpr =
-                        SynExpr.ComputationExpr(expr =
-                            SynExpr.LetOrUseBang(trivia = { EqualsRange = Some mLetBangEquals }
-                                                 andBangs = [ SynExprAndBang(trivia= { EqualsRange = mAndBangEquals }) ]))))
-                ])
-            ])) ->
-        assertRange (3, 11) (3, 12) mLetBangEquals
-        assertRange (4, 11) (4, 12) mAndBangEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynExpr.Record contains the range of the equals sign in SynExprRecordField`` () =
-    let ast =
-        """
-{ V = v
-  X      =   // some comment
-                someLongFunctionCall
-                    a
-                    b
-                    c }
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.Record(recordFields = [
-                            SynExprRecordField(equalsRange = Some mEqualsV)
-                            SynExprRecordField(equalsRange = Some mEqualsX)
-                        ]))
-                ])
-            ])) ->
-        assertRange (2, 4) (2, 5) mEqualsV
-        assertRange (3, 9) (3, 10) mEqualsX
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``inherit SynExpr.Record contains the range of the equals sign in SynExprRecordField`` () =
-    let ast =
-        """
-{ inherit Exception(msg); X = 1; }
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.Record(baseInfo = Some _ ; recordFields = [
-                            SynExprRecordField(equalsRange = Some mEquals)
-                        ]))
-                ])
-            ])) ->
-        assertRange (2, 28) (2, 29) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``copy SynExpr.Record contains the range of the equals sign in SynExprRecordField`` () =
-    let ast =
-        """
-{ foo with
-        X
-            =
-                12 }
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.Record(copyInfo = Some _ ; recordFields = [
-                            SynExprRecordField(equalsRange = Some mEquals)
-                        ]))
-                ])
-            ])) ->
-        assertRange (4, 12) (4, 13) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynExpr.AnonRecord contains the range of the equals sign in the fields`` () =
-    let ast =
-        """
-{| X = 5
-   Y    = 6
-   Z        = 7 |}
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.AnonRecd(recordFields = [
-                            (_, Some mEqualsX, _)
-                            (_, Some mEqualsY, _)
-                            (_, Some mEqualsZ, _)
-                        ]))
-                ])
-            ])) ->
-        assertRange (2, 5) (2, 6) mEqualsX
-        assertRange (3, 8) (3, 9) mEqualsY
-        assertRange (4, 12) (4, 13) mEqualsZ
-    | _ -> Assert.Fail "Could not get valid AST"
-    
-[<Test>]
-let ``SynExpr.For contains the range of the equals sign`` () =
-    let ast =
-        """
-for i = 1 to 10 do
-printf "%d " i
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.For(equalsRange = Some mEquals))
-                ])
-            ])) ->
-        assertRange (2, 6) (2, 7) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynExpr.TryWith contains the range of the try and with keyword`` () =
-    let ast =
-        """
-try
-x
-with
-| ex -> y
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.TryWith(trivia={ TryKeyword = mTry; WithKeyword = mWith }))
-                ])
-            ])) ->
-        assertRange (2, 0) (2, 3) mTry
-        assertRange (4, 0) (4, 4) mWith
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynExpr.TryFinally contains the range of the try and with keyword`` () =
-    let ast =
-        """
-try
-x
-finally
-()
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.TryFinally(trivia={ TryKeyword = mTry; FinallyKeyword = mFinally }))
-                ])
-            ])) ->
-        assertRange (2, 0) (2, 3) mTry
-        assertRange (4, 0) (4, 7) mFinally
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynExpr.Match contains the range of the match and with keyword`` () =
-    let ast =
-        """
-match x with
-| y -> z
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.Match(trivia = { MatchKeyword = mMatch; WithKeyword = mWith }))
-                ])
-            ])) ->
-        assertRange (2, 0) (2, 5) mMatch
-        assertRange (2, 8) (2, 12) mWith
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynExpr.MatchBang contains the range of the match and with keyword`` () =
-    let ast =
-        """
-match! x with
-| y -> z
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.MatchBang(trivia = { MatchBangKeyword = mMatch; WithKeyword = mWith }))
-                ])
-            ])) ->
-        assertRange (2, 0) (2, 6) mMatch
-        assertRange (2, 9) (2, 13) mWith
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynExpr.ObjExpr contains the range of with keyword`` () =
-    let ast =
-        """
-{ new obj() with
-    member x.ToString() = "INotifyEnumerableInternal"
-  interface INotifyEnumerableInternal<'T>
-  interface IEnumerable<_> with
-    member x.GetEnumerator() = null }
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.ObjExpr(withKeyword=Some mWithObjExpr; extraImpls=[ SynInterfaceImpl(withKeyword=None); SynInterfaceImpl(withKeyword=Some mWithSynInterfaceImpl) ]))
-                ])
-            ])) ->
-        assertRange (2, 12) (2, 16) mWithObjExpr
-        assertRange (5, 27) (5, 31) mWithSynInterfaceImpl
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynExpr.LetOrUse contains the range of in keyword`` () =
-    let ast =
-        getParseResults "let x = 1 in ()"
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.LetOrUse(trivia={ InKeyword = Some mIn }))
-                ])
-            ])) ->
-        assertRange (1, 10) (1, 12) mIn
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynExpr.LetOrUse with recursive binding contains the range of in keyword`` () =
-    let ast =
-        getParseResults """
-do
-    let rec f = ()
-    and g = () in
-    ()
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.Do(expr = SynExpr.LetOrUse(bindings=[_;_]; trivia={ InKeyword = Some mIn })))
-                ])
-            ])) ->
-        assertRange (4, 15) (4, 17) mIn
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``nested SynExpr.LetOrUse contains the range of in keyword`` () =
-    let ast =
-        getParseResults """
-let f () =
-    let x = 1 in // the "in" keyword is available in F#
-    let y = 2 in
-    x + y
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Let(bindings = [
-                      SynBinding(expr =
-                          SynExpr.LetOrUse(bindings=[_]; trivia={ InKeyword = Some mIn }; body=SynExpr.LetOrUse(trivia={ InKeyword = Some mInnerIn })))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 14) (3, 16) mIn
-        assertRange (4, 14) (4, 16) mInnerIn
-    | _ -> Assert.Fail "Could not get valid AST"    
-
-[<Test>]
-let ``SynExpr.LetOrUse does not contain the range of in keyword`` () =
-    let ast =
-        getParseResults """
-do
-let x = 1     
-()
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.Do(expr = SynExpr.LetOrUse(trivia={ InKeyword = None })))
-                ])
-            ])) ->
-        Assert.Pass()
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynExpr.LetOrUse where body expr starts with token of two characters does not contain the range of in keyword`` () =
-    let ast =
-        getParseResults """
-do
-let e1 = e :?> Collections.DictionaryEntry
-e1.Key, e1.Value
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.Do(expr = SynExpr.LetOrUse(trivia={ InKeyword = None })))
-                ])
-            ])) ->
-        Assert.Pass()
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``global keyword as SynExpr`` () =
-    let ast =
-        getParseResults """
-global
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.LongIdent(longDotId = SynLongIdent([mangledGlobal], [], [Some (IdentTrivia.OriginalNotation "global")]))
-                )])
-            ])) ->
-        Assert.AreEqual("`global`", mangledGlobal.idText)
-        Assert.Pass()
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynExprRecordFields contain correct amount of trivia`` () =
-    let ast =
-        getParseResults """
-    { JobType = EsriBoundaryImport
-      FileToImport = filePath
-      State = state
-      DryRun = args.DryRun }
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.Record(recordFields = [
-                            SynExprRecordField(fieldName = (synLongIdent, _))
-                            _; _; _
-                        ]))
-                ])
-            ])) ->
-        match synLongIdent.IdentsWithTrivia with
-        | [ _ ] -> Assert.Pass()
-        | idents -> Assert.Fail $"Expected a single SynIdent, got {idents}"
-    | _ -> Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``SynExpr.Dynamic does contain ident`` () =
-    let ast =
-        getParseResults "x?k"
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr = SynExpr.Dynamic (_, _, SynExpr.Ident(idK) ,mDynamicExpr))
-                ])
-            ])) ->
-        Assert.AreEqual("k", idK.idText)
-        assertRange (1,0) (1, 3) mDynamicExpr
-    | _ -> Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``SynExpr.Dynamic does contain parentheses`` () =
-    let ast =
-        getParseResults "x?(g)"
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.Dynamic (_, _, SynExpr.Paren(SynExpr.Ident(idG), lpr, Some rpr, mParen) ,mDynamicExpr))
-                ])
-            ])) ->
-        Assert.AreEqual("g", idG.idText)
-        assertRange (1, 2) (1,3) lpr
-        assertRange (1, 4) (1,5) rpr
-        assertRange (1, 2) (1,5) mParen
-        assertRange (1,0) (1, 5) mDynamicExpr
-    | _ -> Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``SynExpr.Set with SynExpr.Dynamic`` () =
-    let ast =
-        getParseResults "x?v <- 2"
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr = SynExpr.Set(
-                        SynExpr.Dynamic (_, _, SynExpr.Ident(idV) ,mDynamicExpr),
-                        SynExpr.Const _,
-                        mSetExpr
-                    ))
-                ])
-            ])) ->
-        Assert.AreEqual("v", idV.idText)
-        assertRange (1,0) (1, 3) mDynamicExpr
-        assertRange (1,0) (1, 8) mSetExpr
-    | _ -> Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``SynExpr.Obj with setter`` () =
-    let ast =
-        getParseResults """
-[<AbstractClass>]
-type CFoo() =
-    abstract AbstractClassPropertySet: string with set
-
-{ new CFoo() with
-    override this.AbstractClassPropertySet with set (v:string) = () }
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types _
-                    SynModuleDecl.Expr(expr = SynExpr.ObjExpr(members = [
-                        SynMemberDefn.GetSetMember(None, Some _, m, { WithKeyword = mWith; SetKeyword = Some mSet })
-                    ]))
-                ])
-            ])) ->
-        assertRange (7, 43) (7, 47) mWith
-        assertRange (7, 48) (7, 51) mSet
-        assertRange (7,4) (7, 67) m
-    | _ -> Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``SynExpr.AnonRecd with struct keyword`` () =
-    let ast =
-        getParseResults """
-struct 
-    {| Foo =
-    //  meh
-    someValue |}
-
-struct {| |}
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr = SynExpr.AnonRecd(range = m1))
-                    SynModuleDecl.Expr(expr = SynExpr.AnonRecd(range = m2))
-                ])
-            ])) ->
-        assertRange (2,0) (5, 16) m1
-        assertRange (7, 0) (7, 12) m2
-    | _ -> Assert.Fail $"Could not get valid AST, got {ast}"
diff --git a/tests/service/SyntaxTreeTests/ExternTests.fs b/tests/service/SyntaxTreeTests/ExternTests.fs
deleted file mode 100644
index 43ea6e5435a..00000000000
--- a/tests/service/SyntaxTreeTests/ExternTests.fs
+++ /dev/null
@@ -1,21 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.ExternTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-[<Test>]
-let ``extern keyword is present in trivia`` () =
-    let parseResults = getParseResults "extern void GetProcessHeap()"
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Let(bindings = [
-                        SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.Extern mExtern  })
-                    ])
-                ])
-            ])) ->
-        assertRange (1, 0) (1, 6) mExtern
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
diff --git a/tests/service/SyntaxTreeTests/IfThenElseTests.fs b/tests/service/SyntaxTreeTests/IfThenElseTests.fs
deleted file mode 100644
index 66cf9a82849..00000000000
--- a/tests/service/SyntaxTreeTests/IfThenElseTests.fs
+++ /dev/null
@@ -1,177 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.IfThenElseTestsTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-
-[<Test>]
-let ``If keyword in IfThenElse`` () =
-    let parseResults = 
-        getParseResults
-            "if a then b"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.IfThenElse(trivia={ IfKeyword = mIfKw; IsElif = false; ThenKeyword = mThenKw; ElseKeyword = None })
-        )
-    ]) ])) ->
-        assertRange (1, 0) (1, 2) mIfKw
-        assertRange (1, 5) (1, 9) mThenKw
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Else keyword in simple IfThenElse`` () =
-    let parseResults = 
-        getParseResults
-            "if a then b else c"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr =SynExpr.IfThenElse(trivia={ IfKeyword = mIfKw; IsElif = false; ThenKeyword = mThenKw; ElseKeyword = Some mElse })
-        )
-    ]) ])) ->
-        assertRange (1, 0) (1, 2) mIfKw
-        assertRange (1, 5) (1, 9) mThenKw
-        assertRange (1, 12) (1, 16) mElse
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``If, Then and Else keyword on separate lines`` () =
-    let parseResults = 
-        getParseResults
-            """
-if a
-then b
-else c"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.IfThenElse(trivia={ IfKeyword = mIfKw; IsElif = false; ThenKeyword = mThenKw; ElseKeyword = Some mElse })
-        )
-    ]) ])) ->
-        assertRange (2, 0) (2, 2) mIfKw
-        assertRange (3, 0) (3, 4) mThenKw
-        assertRange (4, 0) (4, 4) mElse
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Nested elif in IfThenElse`` () =
-    let parseResults = 
-        getParseResults
-            """
-if a then
-b
-elif c then d"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.IfThenElse(trivia={ IfKeyword = mIfKw; IsElif=false; ThenKeyword = mThenKw; ElseKeyword = None }
-                                      elseExpr = Some (SynExpr.IfThenElse(trivia={ IfKeyword = mElif; IsElif = true })))
-        )
-    ]) ])) ->
-        assertRange (2, 0) (2, 2) mIfKw
-        assertRange (2, 5) (2, 9) mThenKw
-        assertRange (4, 0) (4, 4) mElif
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Nested else if in IfThenElse`` () =
-    let parseResults = 
-        getParseResults
-            """
-if a then
-    b
-else
-    if c then d"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.IfThenElse(trivia={ IfKeyword = mIfKw; IsElif = false; ThenKeyword = mThenKw; ElseKeyword = Some mElse }
-                                      elseExpr = Some (SynExpr.IfThenElse(trivia={ IfKeyword = mElseIf; IsElif = false })))
-        )
-    ]) ])) ->
-        assertRange (2, 0) (2, 2) mIfKw
-        assertRange (2, 5) (2, 9) mThenKw
-        assertRange (4, 0) (4, 4) mElse
-        assertRange (5, 4) (5, 6) mElseIf
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Nested else if on the same line in IfThenElse`` () =
-    let parseResults = 
-        getParseResults
-            """
-if a then
-b
-else if c then
-d"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.IfThenElse(trivia={ IfKeyword = mIfKw; IsElif=false; ThenKeyword = mThenKw; ElseKeyword = Some mElse }
-                                      elseExpr = Some (SynExpr.IfThenElse(trivia={ IfKeyword = mElseIf; IsElif = false })))
-        )
-    ]) ])) ->
-        assertRange (2, 0) (2, 2) mIfKw
-        assertRange (2, 5) (2, 9) mThenKw
-        assertRange (4, 0) (4, 4) mElse
-        assertRange (4, 5) (4, 7) mElseIf
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Deeply nested IfThenElse`` () =
-    let parseResults = 
-        getParseResults
-            """
-if a then
-    b
-elif c then
-    d
-else
-        if e then
-            f
-        else
-            g"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.IfThenElse(trivia={ IfKeyword = mIf1; IsElif = false; ElseKeyword = None }
-                                      elseExpr = Some (SynExpr.IfThenElse(trivia={ IfKeyword = mElif; IsElif = true; ElseKeyword = Some mElse1 }
-                                                                          elseExpr = Some (SynExpr.IfThenElse(trivia={ IfKeyword = mIf2; IsElif = false; ElseKeyword = Some mElse2 }))))))
-    ]) ])) ->
-        assertRange (2, 0) (2, 2) mIf1
-        assertRange (4, 0) (4, 4) mElif
-        assertRange (6, 0) (6, 4) mElse1
-        assertRange (7, 8) (7, 10) mIf2
-        assertRange (9, 8) (9, 12) mElse2
-
-    | _ -> Assert.Fail "Could not get valid AST"
-    
-[<Test>]
-let ``Comment between else and if`` () =
-    let parseResults = 
-        getParseResults
-            """
-if a then
-b
-else (* some long comment here *) if c then
-d"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.IfThenElse(trivia={ IfKeyword = mIf1; IsElif = false; ElseKeyword = Some mElse }
-                                      elseExpr = Some (SynExpr.IfThenElse(trivia = { IfKeyword = mIf2; IsElif = false }))))
-    ]) ])) ->
-        assertRange (2, 0) (2, 2) mIf1
-        assertRange (4, 0) (4, 4) mElse
-        assertRange (4, 34) (4, 36) mIf2
-
-    | _ -> Assert.Fail "Could not get valid AST"
\ No newline at end of file
diff --git a/tests/service/SyntaxTreeTests/LambdaTests.fs b/tests/service/SyntaxTreeTests/LambdaTests.fs
deleted file mode 100644
index ebc343507ab..00000000000
--- a/tests/service/SyntaxTreeTests/LambdaTests.fs
+++ /dev/null
@@ -1,146 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.LambdaTestsTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-
-[<Test>]
-let ``Lambda with two parameters gives correct body`` () =
-    let parseResults = 
-        getParseResults
-            "fun a b -> x"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Lambda(parsedData = Some([SynPat.Named _; SynPat.Named _], SynExpr.Ident ident))
-        )
-    ]) ])) ->
-        Assert.AreEqual("x", ident.idText)
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Lambda with wild card parameter gives correct body`` () =
-    let parseResults = 
-        getParseResults
-            "fun a _ b -> x"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Lambda(parsedData = Some([SynPat.Named _; SynPat.Wild _; SynPat.Named _], SynExpr.Ident ident))
-        )
-    ]) ])) ->
-        Assert.AreEqual("x", ident.idText)
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Lambda with tuple parameter with wild card gives correct body`` () =
-    let parseResults = 
-        getParseResults
-            "fun a (b, _) c -> x"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Lambda(parsedData = Some([SynPat.Named _; SynPat.Paren(SynPat.Tuple _,_); SynPat.Named _], SynExpr.Ident ident))
-        )
-    ]) ])) ->
-        Assert.AreEqual("x", ident.idText)
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Lambda with wild card that returns a lambda gives correct body`` () =
-    let parseResults = 
-        getParseResults
-            "fun _ -> fun _ -> x"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Lambda(parsedData = Some([SynPat.Wild _], SynExpr.Lambda(parsedData = Some([SynPat.Wild _], SynExpr.Ident ident))))
-        )
-    ]) ])) ->
-        Assert.AreEqual("x", ident.idText)
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Simple lambda has arrow range`` () =
-    let parseResults = 
-        getParseResults
-            "fun x -> x"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Lambda(trivia={ ArrowRange = Some mArrow })
-        )
-    ]) ])) ->
-        assertRange (1, 6) (1, 8) mArrow
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Multiline lambda has arrow range`` () =
-    let parseResults = 
-        getParseResults
-            "fun x y z
-                            ->
-                                x * y * z"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Lambda(trivia={ ArrowRange = Some mArrow })
-        )
-    ]) ])) ->
-        assertRange (2, 28) (2, 30) mArrow
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Destructed lambda has arrow range`` () =
-    let parseResults = 
-        getParseResults
-            "fun { X = x } -> x * 2"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Lambda(trivia={ ArrowRange = Some mArrow })
-        )
-    ]) ])) ->
-        assertRange (1, 14) (1, 16) mArrow
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Tuple in lambda has arrow range`` () =
-    let parseResults = 
-        getParseResults
-            "fun (x, _) -> x * 3"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Lambda(trivia={ ArrowRange = Some mArrow })
-        )
-    ]) ])) ->
-        assertRange (1, 11) (1, 13) mArrow
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Complex arguments lambda has arrow range`` () =
-    let parseResults = 
-        getParseResults
-            "fun (x, _) 
-    ({ Y = h::_ }) 
-    (SomePattern(z)) 
-    -> 
-    x * y + z"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Lambda(trivia={ ArrowRange = Some mArrow })
-        )
-    ]) ])) ->
-        assertRange (4, 4) (4, 6) mArrow
-    | _ -> Assert.Fail "Could not get valid AST"
diff --git a/tests/service/SyntaxTreeTests/LeadingKeywordTests.fs b/tests/service/SyntaxTreeTests/LeadingKeywordTests.fs
deleted file mode 100644
index c247376436b..00000000000
--- a/tests/service/SyntaxTreeTests/LeadingKeywordTests.fs
+++ /dev/null
@@ -1,561 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.LeadingKeywordTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-[<Test>]
-let ``let keyword`` () =
-    let parseResults = getParseResults "let a b = b + 1"
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Let(bindings = [
-                        SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.Let mLet  })
-                    ])
-                ])
-            ])) ->
-        assertRange (1, 0) (1, 3) mLet
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``let rec keyword`` () =
-    let parseResults = getParseResults "let rec a b = b + 1"
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Let(bindings = [
-                        SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.LetRec(mLet, mRec)  })
-                    ])
-                ])
-            ])) ->
-        assertRange (1, 0) (1, 3) mLet
-        assertRange (1, 4) (1, 7) mRec
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``and keyword`` () =
-    let parseResults =
-        getParseResults """
-let rec a b = b + 1
-and d e = e + 1
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Let(bindings = [
-                        SynBinding _
-                        SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.And mAnd  })
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 0) (3, 3) mAnd
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``use keyword`` () =
-    let parseResults =
-        getParseResults """
-do
-    use x = X()
-    ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.Do(expr =
-                            SynExpr.LetOrUse(bindings = [
-                                SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.Use mUse })
-                            ])
-                        )
-                    )
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 7) mUse
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``use rec keyword`` () =
-    let parseResults =
-        getParseResults """
-do
-    use rec x = X()
-    ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.Do(expr =
-                            SynExpr.LetOrUse(bindings = [
-                                SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.UseRec(mUse, mRec) })
-                            ])
-                        )
-                    )
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 7) mUse
-        assertRange (3, 8) (3, 11) mRec
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``extern keyword`` () =
-    let parseResults = getParseResults "extern void Meh()"
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Let(bindings = [
-                        SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.Extern mExtern  })
-                    ])
-                ])
-            ])) ->
-        assertRange (1, 0) (1, 6) mExtern
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``member keyword`` () =
-    let parseResults = getParseResults """
-type X =
-    member this.Y ()  = ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.Member(memberDefn = SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.Member mMember }))
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 10) mMember
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``member val keyword`` () =
-    let parseResults = getParseResults  """
-type X =
-    member val Y : int = 1
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.AutoProperty(trivia = { LeadingKeyword = SynLeadingKeyword.MemberVal(mMember, mVal) })
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 10) mMember
-        assertRange (3, 11) (3, 14) mVal
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``override keyword`` () =
-    let parseResults = getParseResults  """
-type D =
-    override E : string = ""
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.Member(memberDefn = SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.Override(mOverride) }))
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 12) mOverride
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``override val keyword`` () =
-    let parseResults = getParseResults  """
-type X =
-    override val Y : int = 1
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.AutoProperty(trivia = { LeadingKeyword = SynLeadingKeyword.OverrideVal(mOverride, mVal) })
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 12) mOverride
-        assertRange (3, 13) (3, 16) mVal
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``abstract keyword`` () =
-    let parseResults = getParseResults """
-type X =
-    abstract Y : int
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.AbstractSlot(slotSig = SynValSig(trivia = { LeadingKeyword = SynLeadingKeyword.Abstract mAbstract }))
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 12) mAbstract
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``abstract member keyword`` () =
-    let parseResults = getParseResults """
-type X =
-    abstract member Y : int
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.AbstractSlot(slotSig = SynValSig(trivia = { LeadingKeyword = SynLeadingKeyword.AbstractMember(mAbstract, mMember) }))
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 12) mAbstract
-        assertRange (3, 13) (3, 19) mMember
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``static member keyword`` () =
-    let parseResults = getParseResults """
-type X =
-    static member Y : int = 1
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.Member(memberDefn = SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.StaticMember(mStatic, mMember) }))
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 10) mStatic
-        assertRange (3, 11) (3, 17) mMember
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``static member val keyword`` () =
-    let parseResults = getParseResults """
-type X =
-    static member val Y : int = 1
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.AutoProperty(trivia = { LeadingKeyword = SynLeadingKeyword.StaticMemberVal(mStatic, mMember, mVal) })
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 10) mStatic
-        assertRange (3, 11) (3, 17) mMember
-        assertRange (3, 18) (3, 21) mVal
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``static abstract keyword`` () =
-    let parseResults = getParseResults """
-type X =
-    static abstract Y : int -> int
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.AbstractSlot(slotSig = SynValSig(trivia = { LeadingKeyword = SynLeadingKeyword.StaticAbstract(mStatic, mAbstract) }))
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 10) mStatic
-        assertRange (3, 11) (3, 19) mAbstract
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``static abstract member keyword`` () =
-    let parseResults = getParseResults """
-type X =
-    static abstract member Y : int -> int
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.AbstractSlot(slotSig = SynValSig(trivia = {
-                                LeadingKeyword = SynLeadingKeyword.StaticAbstractMember(mStatic, mAbstract, mMember)
-                            }))
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 10) mStatic
-        assertRange (3, 11) (3, 19) mAbstract
-        assertRange (3,20) (3, 26) mMember 
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``static val keyword`` () =
-    let parseResults = getParseResultsOfSignatureFile """
-namespace Meh
-
-type X =
-    static val Y : int -> int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile(ParsedSigFileInput(contents = [
-                SynModuleOrNamespaceSig(decls = [
-                    SynModuleSigDecl.Types(types = [
-                        SynTypeDefnSig(typeRepr = SynTypeDefnSigRepr.ObjectModel(memberSigs = [
-                            SynMemberSig.ValField(field =
-                                SynField(trivia = { LeadingKeyword = Some (SynLeadingKeyword.StaticVal(mStatic, mVal)) }))
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (5, 4) (5, 10) mStatic
-        assertRange (5, 11) (5, 14) mVal
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``default keyword`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace X
-
-type Y =
-    default F : int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [ SynModuleOrNamespaceSig(decls = [
-        SynModuleSigDecl.Types(types =[
-            SynTypeDefnSig(typeRepr=SynTypeDefnSigRepr.ObjectModel(memberSigs=[
-                SynMemberSig.Member(memberSig = SynValSig(trivia = { LeadingKeyword = SynLeadingKeyword.Default mDefault }))
-            ]))
-        ])
-    ]) ])) ->
-        assertRange (5, 4) (5, 11) mDefault
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``default val keyword`` () =
-    let ast = """
-type Foo =
-    default val A : int = 1
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types ([
-                SynTypeDefn.SynTypeDefn (typeRepr = SynTypeDefnRepr.ObjectModel (members=[
-                    SynMemberDefn.AutoProperty(trivia = { LeadingKeyword = SynLeadingKeyword.DefaultVal(mDefault , mVal) })
-                ]))
-            ], _)
-        ])
-      ])) ->        
-        assertRange (3, 4) (3, 11) mDefault
-        assertRange (3, 12) (3, 15) mVal
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``val keyword`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace X
-
-type Y =
-    val F : int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [ SynModuleOrNamespaceSig(decls = [
-        SynModuleSigDecl.Types(types =[
-            SynTypeDefnSig(typeRepr=SynTypeDefnSigRepr.ObjectModel(memberSigs=[
-                SynMemberSig.ValField(field = SynField(trivia = { LeadingKeyword = Some (SynLeadingKeyword.Val mVal) }))
-            ]))
-        ])
-    ]) ])) ->
-        assertRange (5, 4) (5, 7) mVal
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``new keyword`` () =
-    let parseResults = getParseResults """
-type Y() =
-    new (message:string) = Y()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.ImplicitCtor _
-                            SynMemberDefn.Member(memberDefn = SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.New mNew }))
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 7) mNew
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``synthetic keyword`` () =
-    let parseResults =
-        getParseResults """
-{ new ISomething with
-    a = () }
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Expr(expr =
-                        SynExpr.ObjExpr(bindings = [
-                            SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.Synthetic })
-                        ])
-                    )
-                ])
-            ])) ->
-        Assert.Pass()
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let `` static let keyword`` () =
-    let parseResults =
-        getParseResults """
-type X =
-    static let PI = 3.14
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.LetBindings(bindings = [
-                                SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.StaticLet(mStatic, mLet) })
-                            ])
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 10) mStatic
-        assertRange (3, 11) (3, 14) mLet
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let `` static let rec keyword`` () =
-    let parseResults =
-        getParseResults """
-type X =
-    static let rec forever () = forever()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.LetBindings(bindings = [
-                                SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.StaticLetRec(mStatic, mLet, mRec) })
-                            ])
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 10) mStatic
-        assertRange (3, 11) (3, 14) mLet
-        assertRange (3, 15) (3, 18) mRec
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let `` do keyword`` () =
-    let parseResults =
-        getParseResults """
-type X =
-    do ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.LetBindings(bindings = [
-                                SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.Do(mDo) })
-                            ])
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 6) mDo
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let `` do static keyword`` () =
-    let parseResults =
-        getParseResults """
-type X =
-    static do ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-                SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-                    SynModuleDecl.Types(typeDefns = [
-                        SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                            SynMemberDefn.LetBindings(bindings = [
-                                SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.StaticDo(mStatic, mDo) })
-                            ])
-                        ]))
-                    ])
-                ])
-            ])) ->
-        assertRange (3, 4) (3, 10) mStatic
-        assertRange (3, 11) (3, 13) mDo
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
diff --git a/tests/service/SyntaxTreeTests/MatchClauseTests.fs b/tests/service/SyntaxTreeTests/MatchClauseTests.fs
deleted file mode 100644
index 5c68abb598a..00000000000
--- a/tests/service/SyntaxTreeTests/MatchClauseTests.fs
+++ /dev/null
@@ -1,231 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.MatchClauseTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-
-[<Test>]
-let ``Range of single SynMatchClause`` () =
-    let parseResults = 
-        getParseResults
-            """
-try
-    let content = tryDownloadFile url
-    Some content
-with ex ->
-    Infrastructure.ReportWarning ex
-    None"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.TryWith(withCases = [ SynMatchClause(range = range) as clause ]))
-    ]) ])) ->
-        assertRange (5, 5) (7, 8) range
-        assertRange (5, 5) (7, 8) clause.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of multiple SynMatchClause`` () =
-    let parseResults = 
-        getParseResults
-            """
-try
-    let content = tryDownloadFile url
-    Some content
-with
-| ex ->
-    Infrastructure.ReportWarning ex
-    None
-| exx ->
-    None"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.TryWith(withCases = [ SynMatchClause(range = r1) as clause1
-                                                                SynMatchClause(range = r2) as clause2 ]))
-    ]) ])) ->
-        assertRange (6, 2) (8, 8) r1
-        assertRange (6, 2) (8, 8) clause1.Range
-        
-        assertRange (9, 2) (10, 8) r2
-        assertRange (9, 2) (10, 8) clause2.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of single SynMatchClause followed by bar`` () =
-    let parseResults = 
-        getParseResults
-            """
-try
-    let content = tryDownloadFile url
-    Some content
-with
-| ex ->
-    ()
-| """
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.TryWith(withCases = [ SynMatchClause(range = range) as clause ]))
-    ]) ])) ->
-        assertRange (6, 2) (7, 6) range
-        assertRange (6, 2) (7, 6) clause.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of single SynMatchClause with missing body`` () =
-    let parseResults = 
-        getParseResults
-            """
-try
-    let content = tryDownloadFile url
-    Some content
-with
-| ex ->"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.TryWith(withCases = [ SynMatchClause(range = range) as clause ]))
-    ]) ])) ->
-        assertRange (6, 2) (6, 4) range
-        assertRange (6, 2) (6, 4) clause.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of single SynMatchClause with missing body and when expr`` () =
-    let parseResults = 
-        getParseResults
-            """
-try
-    let content = tryDownloadFile url
-    Some content
-with
-| ex when (isNull ex) ->"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.TryWith(withCases = [ SynMatchClause(range = range) as clause ]))
-    ]) ])) ->
-        assertRange (6, 2) (6, 21) range
-        assertRange (6, 2) (6, 21) clause.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of arrow in SynMatchClause`` () =
-    let parseResults = 
-        getParseResults
-            """
-match foo with
-| Bar bar -> ()"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.Match(clauses = [ SynMatchClause(trivia={ ArrowRange = Some mArrow }) ]))
-    ]) ])) ->
-        assertRange (3, 10) (3, 12) mArrow
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of arrow in SynMatchClause with when clause`` () =
-    let parseResults = 
-        getParseResults
-            """
-match foo with
-| Bar bar when (someCheck bar) -> ()"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.Match(clauses = [ SynMatchClause(trivia={ ArrowRange = Some mArrow }) ]))
-    ]) ])) ->
-        assertRange (3, 31) (3, 33) mArrow
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of bar in a single SynMatchClause in SynExpr.Match`` () =
-    let parseResults = 
-        getParseResults
-            """
-match foo with
-| Bar bar when (someCheck bar) -> ()"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.Match(clauses = [ SynMatchClause(trivia={ BarRange = Some mBar }) ]))
-    ]) ])) ->
-        assertRange (3, 0) (3, 1) mBar
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of bar in multiple SynMatchClauses in SynExpr.Match`` () =
-    let parseResults = 
-        getParseResults
-            """
-match foo with
-| Bar bar when (someCheck bar) -> ()
-| Far too -> near ()"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.Match(clauses = [ SynMatchClause(trivia={ BarRange = Some mBar1 })
-                                                            SynMatchClause(trivia={ BarRange = Some mBar2 }) ]))
-    ]) ])) ->
-        assertRange (3, 0) (3, 1) mBar1
-        assertRange (4, 0) (4, 1) mBar2
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of bar in a single SynMatchClause in SynExpr.TryWith`` () =
-    let parseResults = 
-        getParseResults
-            """
-try
-    foo ()
-with
-| exn -> ()"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.TryWith(withCases = [ SynMatchClause(trivia={ BarRange = Some mBar }) ]))
-    ]) ])) ->
-        assertRange (5, 0) (5, 1) mBar
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``No range of bar in a single SynMatchClause in SynExpr.TryWith`` () =
-    let parseResults = 
-        getParseResults
-            """
-try
-    foo ()
-with exn ->
-    // some comment
-    ()"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.TryWith(withCases = [ SynMatchClause(trivia={ BarRange = None }) ]))
-    ]) ])) ->
-        Assert.Pass()
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of bar in a multiple SynMatchClauses in SynExpr.TryWith`` () =
-    let parseResults = 
-        getParseResults
-            """
-try
-    foo ()
-with
-| IOException as ioex ->
-    // some comment
-    ()
-| ex -> ()"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.TryWith(withCases = [ SynMatchClause(trivia={ BarRange = Some mBar1 })
-                                                                SynMatchClause(trivia={ BarRange = Some mBar2 }) ]))
-    ]) ])) ->
-        assertRange (5, 0) (5, 1) mBar1
-        assertRange (8, 0) (8, 1) mBar2
-    | _ -> Assert.Fail "Could not get valid AST"
diff --git a/tests/service/SyntaxTreeTests/MeasureTests.fs b/tests/service/SyntaxTreeTests/MeasureTests.fs
deleted file mode 100644
index f8c9f29271a..00000000000
--- a/tests/service/SyntaxTreeTests/MeasureTests.fs
+++ /dev/null
@@ -1,125 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.MeasureTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-
-[<Test>]
-let ``Measure contains the range of the constant`` () =
-    let parseResults = 
-        getParseResults
-            """
-let n = 1.0m<cm>
-let m = 7.000<cm>
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [ SynBinding.SynBinding(expr = SynExpr.Const(SynConst.Measure(constantRange = r1), _)) ])
-        SynModuleDecl.Let(bindings = [ SynBinding.SynBinding(expr = SynExpr.Const(SynConst.Measure(constantRange = r2), _)) ])
-    ]) ])) ->
-        assertRange (2, 8) (2, 12) r1
-        assertRange (3, 8) (3, 13) r2
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynMeasure.Paren has correct range`` () =
-    let parseResults = 
-        getParseResults
-            """
-40u<hr / (staff weeks)>
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Const(SynConst.Measure(SynConst.UInt32 _, _, SynMeasure.Divide(
-                        SynMeasure.Seq([ SynMeasure.Named([ hrIdent ], _) ], _),
-                        SynMeasure.Seq([ SynMeasure.Paren(SynMeasure.Seq([
-                            SynMeasure.Named([ staffIdent ], _)
-                            SynMeasure.Named([ weeksIdent ], _)
-                        ], _) , mParen) ], _),
-                        _)
-                ), _))
-    ]) ])) ->
-        Assert.AreEqual("hr", hrIdent.idText)
-        Assert.AreEqual("staff", staffIdent.idText)
-        Assert.AreEqual("weeks", weeksIdent.idText)
-        assertRange (2, 9) (2, 22) mParen
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-let private (|TypeName|_|) t =
-    match t with
-    | SynType.LongIdent(SynLongIdent([ident], _, _)) -> Some ident.idText
-    | _ -> None
-
-[<Test>]
-let ``SynType.Tuple in measure type with no slashes`` () =
-    let parseResults = 
-        getParseResults
-            """
-[<Measure>] type X = Y * Z
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [
-            SynTypeDefn(typeRepr =
-                SynTypeDefnRepr.Simple(simpleRepr =
-                    SynTypeDefnSimpleRepr.TypeAbbrev(rhsType =
-                        SynType.Tuple(false, [ SynTupleTypeSegment.Type (TypeName "Y")
-                                               SynTupleTypeSegment.Star mStar
-                                               SynTupleTypeSegment.Type (TypeName "Z") ], mTuple))))
-        ])
-    ]) ])) ->
-        assertRange (2, 23) (2, 24) mStar
-        assertRange (2, 21) (2, 26) mTuple
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``SynType.Tuple in measure type with leading slash`` () =
-    let parseResults = 
-        getParseResults
-            """
-[<Measure>] type X = / second
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [
-            SynTypeDefn(typeRepr =
-                SynTypeDefnRepr.Simple(simpleRepr =
-                    SynTypeDefnSimpleRepr.TypeAbbrev(rhsType =
-                        SynType.Tuple(false, [ SynTupleTypeSegment.Slash mSlash
-                                               SynTupleTypeSegment.Type (TypeName "second") ], mTuple))))
-        ])
-    ]) ])) ->
-        assertRange (2, 21) (2, 22) mSlash
-        assertRange (2, 21) (2, 29) mTuple
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-    
-[<Test>]
-let ``SynType.Tuple in measure type with start and slash`` () =
-    let parseResults = 
-        getParseResults
-            """
-[<Measure>] type R = X * Y / Z
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [
-            SynTypeDefn(typeRepr =
-                SynTypeDefnRepr.Simple(simpleRepr =
-                    SynTypeDefnSimpleRepr.TypeAbbrev(rhsType =
-                        SynType.Tuple(false, [ SynTupleTypeSegment.Type (TypeName "X")
-                                               SynTupleTypeSegment.Star msStar
-                                               SynTupleTypeSegment.Type (TypeName "Y")
-                                               SynTupleTypeSegment.Slash msSlash
-                                               SynTupleTypeSegment.Type (TypeName "Z") ], mTuple))))
-        ])
-    ]) ])) ->
-        assertRange (2, 23) (2, 24) msStar
-        assertRange (2, 21) (2, 30) mTuple
-        assertRange (2, 27) (2, 28) msSlash
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
diff --git a/tests/service/SyntaxTreeTests/MemberFlagTests.fs b/tests/service/SyntaxTreeTests/MemberFlagTests.fs
deleted file mode 100644
index c1c55b3a07c..00000000000
--- a/tests/service/SyntaxTreeTests/MemberFlagTests.fs
+++ /dev/null
@@ -1,185 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.MemberFlagTestsTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-
-[<Test>]
-let ``SynMemberSig.Member has correct keywords`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace X
-
-type Y =
-    abstract A : int
-    abstract member B : double
-    static member C : string
-    member D : int
-    override E : int
-    default F : int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [ SynModuleOrNamespaceSig(decls = [
-        SynModuleSigDecl.Types(types =[
-            SynTypeDefnSig(typeRepr=SynTypeDefnSigRepr.ObjectModel(memberSigs=[
-                SynMemberSig.Member(memberSig = SynValSig(trivia = { LeadingKeyword = SynLeadingKeyword.Abstract mAbstract1 }))
-                SynMemberSig.Member(memberSig = SynValSig(trivia = { LeadingKeyword = SynLeadingKeyword.AbstractMember(mAbstract2, mMember1) }))
-                SynMemberSig.Member(memberSig = SynValSig(trivia = { LeadingKeyword = SynLeadingKeyword.StaticMember(mStatic3, mMember3) }))
-                SynMemberSig.Member(memberSig = SynValSig(trivia = { LeadingKeyword = SynLeadingKeyword.Member mMember4 }))
-                SynMemberSig.Member(memberSig = SynValSig(trivia = { LeadingKeyword = SynLeadingKeyword.Override mOverride5 }))
-                SynMemberSig.Member(memberSig = SynValSig(trivia = { LeadingKeyword = SynLeadingKeyword.Default mDefault6 }))
-            ]))
-        ])
-    ]) ])) ->
-        assertRange (5, 4) (5, 12) mAbstract1
-        assertRange (6, 4) (6, 12) mAbstract2
-        assertRange (6, 13) (6, 19) mMember1
-        assertRange (7, 4) (7, 10) mStatic3
-        assertRange (7, 11) (7, 17) mMember3
-        assertRange (8, 4) (8, 10) mMember4
-        assertRange (9, 4) (9, 12) mOverride5
-        assertRange (10, 4) (10, 11) mDefault6
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynMemberDefn.AbstractSlot has correct keyword`` () =
-    let ast = """
-type Foo =
-    abstract X : int
-    abstract member Y: int
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types ([
-                SynTypeDefn.SynTypeDefn (typeRepr = SynTypeDefnRepr.ObjectModel (members=[
-                    SynMemberDefn.AbstractSlot(slotSig = SynValSig(trivia = { LeadingKeyword = SynLeadingKeyword.Abstract mAbstract1 }))
-                    SynMemberDefn.AbstractSlot(slotSig = SynValSig(trivia = { LeadingKeyword = SynLeadingKeyword.AbstractMember(mAbstract2, mMember2) }))
-                ]))
-            ], _)
-        ])
-      ])) ->
-        assertRange (3, 4) (3, 12) mAbstract1
-        assertRange (4, 4) (4, 12) mAbstract2
-        assertRange (4, 13) (4, 19) mMember2
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynMemberDefn.AutoProperty has correct keyword`` () =
-    let ast = """
-type Foo =
-    static member val W : int = 1
-    member val X : int = 1
-    override val Y : int = 2
-    default val Z : int = 1
-"""
-                    |> getParseResults
-
-    let (|LeadingKeyword|_|) md =
-        match md with
-        | SynMemberDefn.AutoProperty(trivia = { LeadingKeyword = lk }) -> Some lk
-        | _ -> None
-    
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types ([
-                SynTypeDefn.SynTypeDefn (typeRepr = SynTypeDefnRepr.ObjectModel (members=[
-                    LeadingKeyword(SynLeadingKeyword.StaticMemberVal(mStatic1, mMember1, mVal1))
-                    LeadingKeyword(SynLeadingKeyword.MemberVal(mMember2, mVal2))
-                    LeadingKeyword(SynLeadingKeyword.OverrideVal(mOverride3, mVal3))
-                    LeadingKeyword(SynLeadingKeyword.DefaultVal(mDefault4, mVal4))
-                ]))
-            ], _)
-        ])
-      ])) ->
-        assertRange (3, 4) (3, 10) mStatic1
-        assertRange (3, 11) (3, 17) mMember1
-        assertRange (3, 18) (3, 21) mVal1
-
-        assertRange (4, 4) (4, 10) mMember2
-        assertRange (4, 11) (4, 14) mVal2
-        
-        assertRange (5, 4) (5, 12) mOverride3
-        assertRange (5, 13) (5, 16) mVal3
-        
-        assertRange (6, 4) (6, 11) mDefault4
-        assertRange (6, 12) (6, 15) mVal4
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynMemberDefn.Member SynValData has correct keyword`` () =
-    let ast = """
-type Foo =
-    static member this.B() = ()
-    member this.A() = ()
-    override this.C() = ()
-    default this.D() = ()
-"""
-                    |> getParseResults
-
-    let (|LeadingKeyword|_|) md =
-        match md with
-        | SynMemberDefn.Member(memberDefn = SynBinding(trivia = { LeadingKeyword = lk })) -> Some lk
-        | _ -> None
-    
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types ([
-                SynTypeDefn.SynTypeDefn (typeRepr = SynTypeDefnRepr.ObjectModel (members=[
-                    LeadingKeyword(SynLeadingKeyword.StaticMember(mStatic1, mMember1))
-                    LeadingKeyword(SynLeadingKeyword.Member(mMember2))
-                    LeadingKeyword(SynLeadingKeyword.Override(mOverride3))
-                    LeadingKeyword(SynLeadingKeyword.Default mDefaultRange4)
-                ]))
-            ], _)
-        ])
-      ])) ->
-        assertRange (3, 4) (3, 10) mStatic1
-        assertRange (3, 11) (3, 17) mMember1
-        assertRange (4, 4) (4, 10) mMember2
-        assertRange (5, 4) (5, 12) mOverride3
-        assertRange (6, 4) (6, 11) mDefaultRange4
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynExpr.Obj members have correct keywords`` () =
-    let ast = """
-let meh =
-    { new Interface with
-        override this.Foo () = ()
-        member this.Bar () = ()
-      interface SomethingElse with
-        member this.Blah () = () }
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Let (bindings = [
-                SynBinding(expr=SynExpr.ObjExpr(
-                    members=[
-                        SynMemberDefn.Member(memberDefn=SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.Override mOverride1 }))
-                        SynMemberDefn.Member(memberDefn=SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.Member mMember2 }))
-                    ]
-                    extraImpls=[ SynInterfaceImpl(members=[
-                        SynMemberDefn.Member(memberDefn=SynBinding(trivia = { LeadingKeyword = SynLeadingKeyword.Member mMember3 }))
-                    ]) ]))
-            ])
-      ]) ])) ->
-        assertRange (4, 8) (4, 16) mOverride1
-        assertRange (5, 8) (5, 14) mMember2
-        assertRange (7, 8) (7, 14) mMember3
-    | _ ->
-        Assert.Fail "Could not get valid AST"
\ No newline at end of file
diff --git a/tests/service/SyntaxTreeTests/MemberTests.fs b/tests/service/SyntaxTreeTests/MemberTests.fs
deleted file mode 100644
index 9b6cfa35379..00000000000
--- a/tests/service/SyntaxTreeTests/MemberTests.fs
+++ /dev/null
@@ -1,387 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.MemberTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-[<Test>]
-let ``SynTypeDefn with AutoProperty contains the range of the equals sign`` () =
-    let parseResults = 
-        getParseResults
-            """
-/// mutable class with auto-properties
-type Person(name : string, age : int) =
-    /// Full name
-    member val Name = name with get, set
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [_ ; SynMemberDefn.AutoProperty(trivia = { EqualsRange = Some mEquals })])) ]
-        )
-    ]) ])) ->
-        assertRange (5, 20) (5, 21) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefn with AutoProperty contains the range of the with keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Foo() =
-    member val AutoProperty = autoProp with get, set
-    member val AutoProperty2 = autoProp
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [_
-                                                                                        SynMemberDefn.AutoProperty(trivia = { WithKeyword = Some mWith
-                                                                                                                              GetSetKeywords = Some (GetSetKeywords.GetSet(mGet, mSet)) })
-                                                                                        SynMemberDefn.AutoProperty(trivia = { WithKeyword = None })])) ]
-        )
-    ]) ])) ->
-        assertRange (3, 39) (3, 43) mWith
-        assertRange (3, 44) (3, 47) mGet
-        assertRange (3, 49) (3, 52) mSet
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefn with AbstractSlot contains the range of the with keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Foo() =
-    abstract member Bar : int with get,set
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [_
-                                                                                        SynMemberDefn.AbstractSlot(slotSig=SynValSig(trivia = { WithKeyword = Some mWith })
-                                                                                                                   trivia = { GetSetKeywords = Some (GetSetKeywords.GetSet(mGet, mSet)) })])) ]
-        )
-    ]) ])) ->
-        assertRange (3, 30) (3, 34) mWith
-        assertRange (3, 35) (3, 38) mGet
-        assertRange (3, 39) (3, 42) mSet
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``read-only property in SynMemberDefn.Member contains the range of the with keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Foo() =
-    // A read-only property.
-    member this.MyReadProperty with get () = myInternalValue
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr =
-                SynTypeDefnRepr.ObjectModel(members=[
-                    _
-                    SynMemberDefn.GetSetMember(Some(SynBinding _), None, _, { WithKeyword = mWith }) ])
-                ) ])
-         ]) ])) ->
-        assertRange (4, 31) (4, 35) mWith
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``write-only property in SynMemberDefn.Member contains the range of the with keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Foo() =
-    // A write-only property.
-    member this.MyWriteOnlyProperty with set (value) = myInternalValue <- value
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr =
-                SynTypeDefnRepr.ObjectModel(members=[
-                     _
-                     SynMemberDefn.GetSetMember(None, Some(SynBinding _), _, { WithKeyword = mWith }) ])
-                ) ])
-         ]) ])) ->
-        assertRange (4, 36) (4, 40) mWith
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``read/write property in SynMemberDefn.Member contains the range of the with keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Foo() =
-    // A read-write property.
-    member this.MyReadWriteProperty
-        with get () = myInternalValue
-        and set (value) = myInternalValue <- value
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr =
-                SynTypeDefnRepr.ObjectModel(members=[
-                   _
-                   SynMemberDefn.GetSetMember(Some _, Some _, _, { WithKeyword = mWith; AndKeyword = Some mAnd }) ])
-                ) ])
-         ]) ])) ->
-        assertRange (5, 8) (5, 12) mWith
-        assertRange (6, 8) (6, 11) mAnd
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefn with static member with get/set`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Foo =
-    static member ReadWrite2 
-        with set  x = lastUsed <- ("ReadWrite2", x)
-        and  get () = lastUsed <- ("ReadWrite2", 0); 4
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                SynMemberDefn.GetSetMember(Some _, Some _, m, { WithKeyword = mWith
-                                                                GetKeyword = Some mGet
-                                                                AndKeyword = Some mAnd
-                                                                SetKeyword = Some mSet })
-            ])) ]
-        )
-    ]) ])) ->
-        assertRange (4, 8) (4, 12) mWith
-        assertRange (4, 13) (4, 16) mSet
-        assertRange (5, 8) (5, 11) mAnd
-        assertRange (5, 13) (5, 16) mGet
-        assertRange (3, 4) (5, 54) m
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefn with member with set/get`` () =
-    let parseResults = 
-        getParseResults
-            """
-type A() =
-    member this.Z with set (_:int):unit = () and get():int = 1
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                SynMemberDefn.ImplicitCtor _
-                SynMemberDefn.GetSetMember(Some (SynBinding(headPat = SynPat.LongIdent(extraId = Some getIdent))),
-                                           Some (SynBinding(headPat = SynPat.LongIdent(extraId = Some setIdent))),
-                                           m,
-                                           { WithKeyword = mWith
-                                             GetKeyword = Some mGet
-                                             AndKeyword = Some mAnd
-                                             SetKeyword = Some mSet })
-            ])) ]
-        )
-    ]) ])) ->
-        Assert.AreEqual("get", getIdent.idText)
-        Assert.AreEqual("set", setIdent.idText)
-        assertRange (3, 18) (3, 22) mWith
-        assertRange (3, 23) (3, 26) mSet
-        assertRange (3, 23) (3, 26) setIdent.idRange
-        assertRange (3, 45) (3, 48) mAnd
-        assertRange (3, 49) (3, 52) mGet
-        assertRange (3, 49) (3, 52) getIdent.idRange
-        assertRange (3, 4) (3, 62) m
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefn with member with get has xml comment`` () =
-    let parseResults = 
-        getParseResults
-            """
-type A =
-    /// B
-    member x.B with get() = 5
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                SynMemberDefn.GetSetMember(Some (SynBinding(xmlDoc = preXmlDoc)),
-                                           None,
-                                           _,
-                                           _)
-            ])) ]
-        )
-    ]) ])) ->
-        Assert.False preXmlDoc.IsEmpty
-        let comment = preXmlDoc.ToXmlDoc(false, None).GetXmlText()
-        Assert.False (System.String.IsNullOrWhiteSpace(comment))
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Signature member with set,get`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-module Meh
-
-type X =
-    // MemberSig.Member
-    member Y : int
-                    with
-                            set  ,  get
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents=[
-        SynModuleOrNamespaceSig(decls=[
-            SynModuleSigDecl.Types(types = [
-                SynTypeDefnSig(typeRepr = SynTypeDefnSigRepr.ObjectModel(memberSigs = [
-                    SynMemberSig.Member(memberSig = SynValSig(trivia = { WithKeyword = Some mWith })
-                                        trivia = { GetSetKeywords = Some (GetSetKeywords.GetSet(mGet, mSet)) })
-                ]))
-            ])
-        ] ) ])) ->
-        assertRange (7, 20) (7, 24) mWith
-        assertRange (8, 28) (8, 31) mSet
-        assertRange (8, 36) (8, 39) mGet
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Signature member with set`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-module Meh
-
-type X =
-    // MemberSig.Member
-    member Y : int
-                    with
-                            set
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents=[
-        SynModuleOrNamespaceSig(decls=[
-            SynModuleSigDecl.Types(types = [
-                SynTypeDefnSig(typeRepr = SynTypeDefnSigRepr.ObjectModel(memberSigs = [
-                    SynMemberSig.Member(memberSig = SynValSig(trivia = { WithKeyword = Some mWith })
-                                        trivia = { GetSetKeywords = Some (GetSetKeywords.Set(mSet)) })
-                ]))
-            ])
-        ] ) ])) ->
-        assertRange (7, 20) (7, 24) mWith
-        assertRange (8, 28) (8, 31) mSet
-    | _ -> Assert.Fail "Could not get valid AST"
-
-
-[<Test>]
-let ``Signature member with get`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-module Meh
-
-type X =
-    // MemberSig.Member
-    member Y : int
-                    with
-                                get
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents=[
-        SynModuleOrNamespaceSig(decls=[
-            SynModuleSigDecl.Types(types = [
-                SynTypeDefnSig(typeRepr = SynTypeDefnSigRepr.ObjectModel(memberSigs = [
-                    SynMemberSig.Member(memberSig = SynValSig(trivia = { WithKeyword = Some mWith })
-                                        trivia = { GetSetKeywords = Some (GetSetKeywords.Get(mGet)) })
-                ]))
-            ])
-        ] ) ])) ->
-        assertRange (7, 20) (7, 24) mWith
-        assertRange (8, 32) (8, 35) mGet
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Member with inline keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-type X =
-    member inline x.Y () = ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                SynMemberDefn.Member(memberDefn = SynBinding(trivia = { InlineKeyword = Some mInline }))
-            ])) ]
-        )
-    ]) ])) ->
-        assertRange (3, 11) (3, 17) mInline
-    | ast -> Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``Get/Set member with inline keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-type X =
-    member inline x.Y 
-        with inline get () = 4
-        and inline set y = ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                SynMemberDefn.GetSetMember(Some (SynBinding(trivia = { InlineKeyword = Some mInlineGet })),
-                                           Some (SynBinding(trivia = { InlineKeyword = Some mInlineSet })),
-                                           _,
-                                           { InlineKeyword = Some mInlineGetSetMember })
-            ])) ]
-        )
-    ]) ])) ->
-        assertRange (3, 11) (3, 17) mInlineGetSetMember
-        assertRange (4, 13) (4, 19) mInlineGet
-        assertRange (5, 12) (5, 18) mInlineSet
-    | ast -> Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``ImplicitCtor with as keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-type internal CompilerStateCache(readAllBytes: string -> byte[], projectOptions: FSharpProjectOptions)
-//#if !NO_TYPEPROVIDERS
-    as this =
-//#else
-//     =
-// #endif
-    class end
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(implicitConstructor = Some (SynMemberDefn.ImplicitCtor(trivia = { AsKeyword = Some mAs }))) ]
-        )
-    ]) ])) ->
-        assertRange (4, 4) (4, 6) mAs
-    | ast -> Assert.Fail $"Could not get valid AST, got {ast}"
diff --git a/tests/service/SyntaxTreeTests/ModuleOrNamespaceSigTests.fs b/tests/service/SyntaxTreeTests/ModuleOrNamespaceSigTests.fs
deleted file mode 100644
index b49dfc3850b..00000000000
--- a/tests/service/SyntaxTreeTests/ModuleOrNamespaceSigTests.fs
+++ /dev/null
@@ -1,93 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.ModuleOrNamespaceSigTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-[<Test>]
-let ``Range member returns range of SynModuleOrNamespaceSig`` () =
-    let parseResults =
-        getParseResultsOfSignatureFile
-            """
-namespace Foobar
-
-type Bar = | Bar of string * int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile(ParsedSigFileInput(contents = [
-        SynModuleOrNamespaceSig(kind = SynModuleOrNamespaceKind.DeclaredNamespace) as singleModule
-    ])) ->
-        assertRange (2,0) (4,32) singleModule.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``GlobalNamespace should start at namespace keyword`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """// foo
-// bar
-namespace  global
-
-type Bar = | Bar of string * int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [
-        SynModuleOrNamespaceSig(kind = SynModuleOrNamespaceKind.GlobalNamespace; range = r) ])) ->
-        assertRange (3, 0) (5, 32) r
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Module range should start at first attribute`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
- [<  Foo  >]
-module Bar
-
-val s : string
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [
-        SynModuleOrNamespaceSig.SynModuleOrNamespaceSig(kind = SynModuleOrNamespaceKind.NamedModule; range = r) ])) ->
-        assertRange (2, 1) (5, 14) r
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Module should contain module keyword`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-module Bar
-
-val a: int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [
-        SynModuleOrNamespaceSig(
-            kind = SynModuleOrNamespaceKind.NamedModule
-            trivia = { LeadingKeyword = SynModuleOrNamespaceLeadingKeyword.Module mModule }) ])) ->
-        assertRange (2, 0) (2, 6) mModule
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Namespace should contain namespace keyword`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace Foo
-module Bar =
-val a: int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [
-        SynModuleOrNamespaceSig(
-            kind = SynModuleOrNamespaceKind.DeclaredNamespace
-            trivia = { LeadingKeyword = SynModuleOrNamespaceLeadingKeyword.Namespace mNamespace }) ])) ->
-        assertRange (2, 0) (2, 9) mNamespace
-    | _ -> Assert.Fail "Could not get valid AST"
\ No newline at end of file
diff --git a/tests/service/SyntaxTreeTests/ModuleOrNamespaceTests.fs b/tests/service/SyntaxTreeTests/ModuleOrNamespaceTests.fs
deleted file mode 100644
index 7b444091363..00000000000
--- a/tests/service/SyntaxTreeTests/ModuleOrNamespaceTests.fs
+++ /dev/null
@@ -1,140 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.ModuleOrNamespaceTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-[<Test>]
-let ``DeclaredNamespace range should start at namespace keyword`` () =
-    let parseResults = 
-        getParseResults
-            """namespace TypeEquality
-
-/// A type for witnessing type equality between 'a and 'b
-type Teq<'a, 'b>
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(kind = SynModuleOrNamespaceKind.DeclaredNamespace; range = r) ])) ->
-        assertRange (1, 0) (4, 8) r
-    | _ -> Assert.Fail "Could not get valid AST"
-    
-[<Test>]
-let ``Multiple DeclaredNamespaces should have a range that starts at the namespace keyword`` () =
-    let parseResults = 
-        getParseResults
-            """namespace TypeEquality
-
-/// A type for witnessing type equality between 'a and 'b
-type Teq = class end
-
-namespace Foobar
-
-let x = 42
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(kind = SynModuleOrNamespaceKind.DeclaredNamespace; range = r1)
-        SynModuleOrNamespace.SynModuleOrNamespace(kind = SynModuleOrNamespaceKind.DeclaredNamespace; range = r2) ])) ->
-        assertRange (1, 0) (4, 20) r1
-        assertRange (6, 0) (8, 10) r2
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``GlobalNamespace should start at namespace keyword`` () =
-    let parseResults = 
-        getParseResults
-            """// foo
-// bar
-namespace  global
-
-type X = int
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(kind = SynModuleOrNamespaceKind.GlobalNamespace; range = r) ])) ->
-        assertRange (3, 0) (5, 12) r
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Module range should start at first attribute`` () =
-    let parseResults = 
-        getParseResults
-            """
-[<  Foo  >]
-module Bar
-
-let s : string = "s"
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(kind = SynModuleOrNamespaceKind.NamedModule; range = r) ])) ->
-        assertRange (2, 0) (5, 20) r
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Module should contain module keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-/// this file contains patches to the F# Compiler Service that have not yet made it into
-/// published nuget packages.  We source-copy them here to have a consistent location for our to-be-removed extensions
-
-module FsAutoComplete.FCSPatches
-
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.Text
-open FsAutoComplete.UntypedAstUtils
-open FSharp.Compiler.CodeAnalysis
-
-module internal SynExprAppLocationsImpl =
-let a = 42
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(
-            kind = SynModuleOrNamespaceKind.NamedModule
-            trivia = { LeadingKeyword = SynModuleOrNamespaceLeadingKeyword.Module mModule }) ])) ->
-        assertRange (5, 0) (5, 6) mModule
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Namespace should contain namespace keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-namespace Foo
-module Bar =
-let a = 42
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(
-            kind = SynModuleOrNamespaceKind.DeclaredNamespace
-            trivia = { LeadingKeyword = SynModuleOrNamespaceLeadingKeyword.Namespace mNamespace }) ])) ->
-        assertRange (2, 0) (2, 9) mNamespace
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``global in open path should contain trivia`` () =
-    let parseResults = 
-        getParseResults
-            """
-namespace Ionide.VSCode.FSharp
-
-open global.Node
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Open(target = SynOpenDeclTarget.ModuleOrNamespace(longId = SynLongIdent(trivia = [ Some (IdentTrivia.OriginalNotation("global")); None ])))
-        ]) ])) ->
-        Assert.Pass()
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
diff --git a/tests/service/SyntaxTreeTests/NestedModuleTests.fs b/tests/service/SyntaxTreeTests/NestedModuleTests.fs
deleted file mode 100644
index fcdde98008a..00000000000
--- a/tests/service/SyntaxTreeTests/NestedModuleTests.fs
+++ /dev/null
@@ -1,172 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.NestedModuleTestsTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-
-
-[<Test>]
-let ``Range of attribute should be included in SynModuleSigDecl.NestedModule`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace SomeNamespace
-
-[<Foo>]
-module Nested =
-    val x : int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [ SynModuleOrNamespaceSig(decls = [
-        SynModuleSigDecl.NestedModule _ as nm
-    ]) as sigModule ])) ->
-        assertRange (4, 0) (6, 15) nm.Range
-        assertRange (2, 0) (6, 15) sigModule.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute should be included in SynModuleDecl.NestedModule`` () =
-    let parseResults = 
-        getParseResults
-            """
-module TopLevel
-
-[<Foo>]
-module Nested =
-    ()"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.NestedModule _ as nm
-    ]) ])) ->
-        assertRange (4, 0) (6, 6) nm.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-    
-[<Test>]
-let ``Range of equal sign should be present`` () =
-    let parseResults = 
-        getParseResults
-            """
-module X =
-()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.NestedModule(trivia = { ModuleKeyword = Some mModule; EqualsRange = Some mEquals })
-    ]) ])) ->
-        assertRange (2, 0) (2, 6) mModule
-        assertRange (2, 9) (2, 10) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of equal sign should be present, signature file`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace Foo
-
-module X =
-val bar : int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [ SynModuleOrNamespaceSig(decls = [
-        SynModuleSigDecl.NestedModule(trivia = { ModuleKeyword = Some mModule; EqualsRange = Some mEquals })
-    ]) ])) ->
-        assertRange (4, 0) (4, 6) mModule
-        assertRange (4, 9) (4, 10) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of nested module in signature file should end at the last SynModuleSigDecl`` () =
-    let parseResults =
-        getParseResultsOfSignatureFile
-            """namespace Microsoft.FSharp.Core
-
-open System
-open System.Collections.Generic
-open Microsoft.FSharp.Core
-open Microsoft.FSharp.Collections
-open System.Collections
-
-
-module Tuple =
-
-    type Tuple<'T1,'T2,'T3,'T4> =
-        interface IStructuralEquatable
-        interface IStructuralComparable
-        interface IComparable
-        new : 'T1 * 'T2 * 'T3 * 'T4 -> Tuple<'T1,'T2,'T3,'T4>
-        member Item1 : 'T1 with get
-        member Item2 : 'T2 with get
-        member Item3 : 'T3 with get
-        member Item4 : 'T4 with get
-
-
-module Choice =
-
-    /// <summary>Helper types for active patterns with 6 choices.</summary>
-    [<StructuralEquality; StructuralComparison>]
-    [<CompiledName("FSharpChoice`6")>]
-    type Choice<'T1,'T2,'T3,'T4,'T5,'T6> =
-      /// <summary>Choice 1 of 6 choices</summary>
-      | Choice1Of6 of 'T1
-      /// <summary>Choice 2 of 6 choices</summary>
-      | Choice2Of6 of 'T2
-      /// <summary>Choice 3 of 6 choices</summary>
-      | Choice3Of6 of 'T3
-      /// <summary>Choice 4 of 6 choices</summary>
-      | Choice4Of6 of 'T4
-      /// <summary>Choice 5 of 6 choices</summary>
-      | Choice5Of6 of 'T5
-      /// <summary>Choice 6 of 6 choices</summary>
-      | Choice6Of6 of 'T6
-
-
-
-/// <summary>Basic F# Operators. This module is automatically opened in all F# code.</summary>
-[<AutoOpen>]
-module Operators =
-
-    type ``[,]``<'T> with
-        [<CompiledName("Length1")>]
-        /// <summary>Get the length of an array in the first dimension  </summary>
-        member Length1 : int
-        [<CompiledName("Length2")>]
-        /// <summary>Get the length of the array in the second dimension  </summary>
-        member Length2 : int
-        [<CompiledName("Base1")>]
-        /// <summary>Get the lower bound of the array in the first dimension  </summary>
-        member Base1 : int
-        [<CompiledName("Base2")>]
-        /// <summary>Get the lower bound of the array in the second dimension  </summary>
-        member Base2 : int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [ SynModuleOrNamespaceSig(decls = [
-          SynModuleSigDecl.Open _
-          SynModuleSigDecl.Open _
-          SynModuleSigDecl.Open _
-          SynModuleSigDecl.Open _
-          SynModuleSigDecl.Open _
-          SynModuleSigDecl.NestedModule(range=mTupleModule; moduleDecls=[ SynModuleSigDecl.Types([
-              SynTypeDefnSig(typeRepr=SynTypeDefnSigRepr.ObjectModel(range=mTupleObjectModel); range=mTupleType)
-          ], mTupleTypes) ])
-          SynModuleSigDecl.NestedModule(range=mChoiceModule)
-          SynModuleSigDecl.NestedModule(range=mOperatorsModule; moduleDecls=[ SynModuleSigDecl.Types([
-              SynTypeDefnSig(typeRepr=SynTypeDefnSigRepr.Simple(range=mAugmentationSimple); range=mAugmentation)
-          ], mOperatorsTypes) ])
-      ]) ])) ->
-        assertRange (10, 0) (20, 35) mTupleModule
-        assertRange (12, 4) (20, 35) mTupleTypes
-        assertRange (12, 9) (20, 35) mTupleType
-        assertRange (13, 8) (20, 35) mTupleObjectModel
-        assertRange (23, 0) (40, 25) mChoiceModule
-        assertRange (44, 0) (60, 26) mOperatorsModule
-        assertRange (48, 4) (60, 26) mOperatorsTypes
-        assertRange (48, 9) (60, 26) mAugmentation
-        assertRange (48, 9) (60, 26) mAugmentationSimple
-    | _ -> Assert.Fail "Could not get valid AST"
\ No newline at end of file
diff --git a/tests/service/SyntaxTreeTests/OperatorNameTests.fs b/tests/service/SyntaxTreeTests/OperatorNameTests.fs
deleted file mode 100644
index 9efbb4dc972..00000000000
--- a/tests/service/SyntaxTreeTests/OperatorNameTests.fs
+++ /dev/null
@@ -1,486 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.OperatorNameTestsTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-[<Test>]
-let ``operator as function`` () =
-    let ast = """
-(+) 3 4
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Expr (expr = SynExpr.App(funcExpr = SynExpr.App(funcExpr =
-                SynExpr.LongIdent(longDotId = SynLongIdent([ident], _, [Some (IdentTrivia.OriginalNotationWithParen(lpr, "+", rpr))])))))
-            ])
-        ])) ->
-        assertRange (2, 0) (2, 1) lpr
-        Assert.AreEqual("op_Addition", ident.idText)
-        assertRange (2, 2) (2, 3) rpr
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``active pattern as function `` () =
-    let ast = """
-(|Odd|Even|) 4
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Expr (expr = SynExpr.App(funcExpr =
-                SynExpr.LongIdent(false, SynLongIdent([ ident ], _, [ Some(IdentTrivia.HasParenthesis(lpr, rpr)) ]), None, pr)))
-            ])
-        ])) ->
-        assertRange (2, 0) (2, 1) lpr
-        Assert.AreEqual("|Odd|Even|", ident.idText)
-        assertRange (2, 11) (2, 12) rpr
-        assertRange (2, 0) (2, 12) pr
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``partial active pattern as function `` () =
-    let ast = """
-(|Odd|_|) 4
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Expr (expr = SynExpr.App(funcExpr =
-                SynExpr.LongIdent(false, SynLongIdent([ ident ], _, [ Some(IdentTrivia.HasParenthesis(lpr, rpr)) ]), None, pr)))
-            ])
-        ])) ->
-        assertRange (2, 0) (2, 1) lpr
-        Assert.AreEqual("|Odd|_|", ident.idText)
-        assertRange (2, 8) (2, 9) rpr
-        assertRange (2, 0) (2, 9) pr
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``custom operator definition`` () =
-    let ast = """
-let (+) a b = a + b
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Let(bindings = [SynBinding(headPat=
-                SynPat.LongIdent(longDotId = SynLongIdent([ ident ],_, [ Some (IdentTrivia.OriginalNotationWithParen(lpr, "+", rpr)) ])))
-            ])
-        ])])) ->
-        assertRange (2, 4) (2,5) lpr
-        Assert.AreEqual("op_Addition", ident.idText)
-        assertRange (2, 6) (2, 7) rpr
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``active pattern definition`` () =
-    let ast = """
-let (|Odd|Even|) (a: int) = if a % 2 = 0 then Even else Odd
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Let(bindings = [SynBinding(headPat=
-                SynPat.LongIdent(longDotId = SynLongIdent([ident], _, [Some (IdentTrivia.HasParenthesis(lpr, rpr))])))
-            ])
-        ])])) ->
-        assertRange (2, 4) (2, 5) lpr
-        Assert.AreEqual("|Odd|Even|", ident.idText)
-        assertRange (2, 15) (2, 16) rpr
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``partial active pattern definition`` () =
-    let ast = """
-let (|Int32Const|_|) (a: SynConst) = match a with SynConst.Int32 _ -> Some a | _ -> None
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Let(bindings = [SynBinding(headPat=
-                SynPat.LongIdent(longDotId = SynLongIdent([ident], _, [Some (IdentTrivia.HasParenthesis(lpr, rpr))])))
-            ])
-        ])])) ->
-         assertRange (2, 4) (2, 5) lpr
-         Assert.AreEqual("|Int32Const|_|", ident.idText)
-         assertRange (2, 19) (2, 20) rpr
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``partial active pattern definition without parameters`` () =
-    let ast = """
-let (|Boolean|_|) = Boolean.parse
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Let(bindings = [SynBinding(headPat=
-                SynPat.Named(ident = SynIdent(ident, Some (IdentTrivia.HasParenthesis(lpr, rpr)))))
-            ])
-        ])])) ->
-         assertRange (2, 4) (2, 5) lpr
-         Assert.AreEqual("|Boolean|_|", ident.idText)
-         assertRange (2, 16) (2, 17) rpr
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-
-[<Test>]
-let ``operator name in SynValSig`` () =
-    let ast = """
-module IntrinsicOperators
-val (&): e1: bool -> e2: bool -> bool
-"""
-                    |> getParseResultsOfSignatureFile
-
-    match ast with
-    | ParsedInput.SigFile(ParsedSigFileInput(contents = [
-        SynModuleOrNamespaceSig(decls = [
-            SynModuleSigDecl.Val(valSig = SynValSig(ident = SynIdent(ident, Some (IdentTrivia.OriginalNotationWithParen(lpr, "&", rpr)))
-            ))])
-        ])) ->
-        assertRange (3, 4) (3, 5) lpr
-        Assert.AreEqual("op_Amp", ident.idText)
-        assertRange (3, 6) (3, 7) rpr
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``operator name in val constraint`` () =
-    let ast =
-        getParseResultsOfSignatureFile """
-    [<AutoOpen>]
-    module Operators
-    /// <summary>Overloaded unary negation.</summary>
-    ///
-    /// <param name="n">The value to negate.</param>
-    ///
-    /// <returns>The result of the operation.</returns>
-    /// 
-    /// <example-tbd></example-tbd>
-    /// 
-    val inline (~-): n: ^T -> ^T when ^T: (static member ( ~- ): ^T -> ^T) and default ^T: int
-"""
-
-    match ast with
-    | ParsedInput.SigFile(ParsedSigFileInput(contents = [
-        SynModuleOrNamespaceSig(decls = [
-            SynModuleSigDecl.Val(valSig = SynValSig(synType=SynType.WithGlobalConstraints(constraints=[
-                SynTypeConstraint.WhereTyparSupportsMember(memberSig=SynMemberSig.Member(memberSig=SynValSig(ident =
-                    SynIdent(ident, Some (IdentTrivia.OriginalNotationWithParen(lpr, "~-", rpr))))))
-                SynTypeConstraint.WhereTyparDefaultsToType _
-            ])))
-            ])
-        ])) ->
-        assertRange (12, 57) (12, 58) lpr
-        Assert.AreEqual("op_UnaryNegation", ident.idText)
-        assertRange (12, 62) (12, 63) rpr
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``named parameter`` () =
-    let ast = getParseResults """
-f(x=4)
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Expr(expr = SynExpr.App(argExpr = SynExpr.Paren(expr = SynExpr.App(funcExpr=
-                SynExpr.App(funcExpr= SynExpr.LongIdent(longDotId = SynLongIdent([ident], _, [Some (IdentTrivia.OriginalNotation "=")])))))))
-            ])
-        ])) ->
-        Assert.AreEqual("op_Equality", ident.idText)
-        assertRange (2,3) (2,4) ident.idRange
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``infix operation`` () =
-    let ast = getParseResults """
-1 + 1
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Expr(expr =
-                SynExpr.App(funcExpr = SynExpr.App(isInfix = true
-                                                   funcExpr = SynExpr.LongIdent(longDotId = SynLongIdent([ident], _, [Some (IdentTrivia.OriginalNotation "+")]))
-                                                   argExpr = SynExpr.Const(SynConst.Int32(1), _))
-                            argExpr = SynExpr.Const(SynConst.Int32(1), _)))
-            ])
-        ])) ->
-        Assert.AreEqual("op_Addition", ident.idText)
-        assertRange (2,2) (2,3) ident.idRange
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``prefix operation`` () =
-    let ast = getParseResults """
-+ -86
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Expr(expr =
-                SynExpr.App(isInfix = false
-                            funcExpr = SynExpr.LongIdent(longDotId = SynLongIdent([ident], _, [Some (IdentTrivia.OriginalNotation "+")]))
-                            argExpr = SynExpr.Const(SynConst.Int32(-86), _)))
-            ])
-        ])) ->
-        Assert.AreEqual("op_UnaryPlus", ident.idText)
-        assertRange (2,0) (2,1) ident.idRange
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``prefix operation with two characters`` () =
-    let ast = getParseResults """
-%%arg
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Expr(expr =
-                SynExpr.App(isInfix = false
-                            funcExpr = SynExpr.LongIdent(longDotId = SynLongIdent([ident], _, [Some (IdentTrivia.OriginalNotation "%%")]))
-                            argExpr = SynExpr.Ident argIdent))
-            ])
-        ])) ->
-        Assert.AreEqual("op_SpliceUntyped", ident.idText)
-        assertRange (2,0) (2,2) ident.idRange
-        Assert.AreEqual("arg", argIdent.idText)
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"    
-
-[<Test>]
-let ``detect difference between compiled operators`` () =
-    let ast = getParseResults """
-(+) a b
-op_Addition a b
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Expr(expr =
-                SynExpr.App(funcExpr = SynExpr.App(isInfix = false
-                                                   funcExpr = SynExpr.LongIdent(longDotId = SynLongIdent([ident], _, [Some (IdentTrivia.OriginalNotationWithParen(lpr, "+", rpr))]))
-                                                   argExpr = SynExpr.Ident a1)
-                            argExpr = SynExpr.Ident b1))
-            SynModuleDecl.Expr(expr =
-                SynExpr.App(funcExpr = SynExpr.App(isInfix = false
-                                                   funcExpr = SynExpr.Ident op_Addition
-                                                   argExpr = SynExpr.Ident a2)
-                            argExpr = SynExpr.Ident b2)
-                )
-            ])
-        ])) ->
-        assertRange (2,0) (2,1) lpr
-        Assert.AreEqual("op_Addition", ident.idText)
-        assertRange (2,2) (2,3) rpr
-        Assert.AreEqual("a", a1.idText)
-        Assert.AreEqual("b", b1.idText)
-
-        Assert.AreEqual("op_Addition", op_Addition.idText)
-        Assert.AreEqual("a", a2.idText)
-        Assert.AreEqual("b", b2.idText)
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``operator in member definition`` () =
-    let ast = getParseResults """
-type X with
-    member _.(+) a b = a + b
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types(typeDefns = [
-                SynTypeDefn(members = [
-                    SynMemberDefn.Member(memberDefn = SynBinding(headPat = SynPat.LongIdent(longDotId =
-                        SynLongIdent([ _; operatorIdent ], [ mDot ], [ None; Some (IdentTrivia.OriginalNotationWithParen(lpr, "+", rpr)) ]) as lid)))
-                ])
-                ]
-            )
-            ])
-        ])) ->
-        assertRange (3,12) (3,13) mDot
-        assertRange (3,13) (3,14) lpr
-        Assert.AreEqual("op_Addition", operatorIdent.idText)
-        assertRange (3,15) (3,16) rpr
-        assertRange (3,11) (3,15) lid.Range
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``nameof operator`` () =
-    let ast = getParseResults """
-nameof(+)
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Expr(expr =
-                                SynExpr.App(isInfix = false
-                                            funcExpr = SynExpr.Ident nameofIdent
-                                            argExpr =
-                                                SynExpr.LongIdent(longDotId = SynLongIdent([operatorIdent], _, [Some (IdentTrivia.OriginalNotationWithParen(lpr, "+", rpr))]))
-                                )
-                )
-            ])
-        ])) ->
-        Assert.AreEqual("nameof", nameofIdent.idText)
-        assertRange (2,6) (2,7) lpr
-        Assert.AreEqual("op_Addition", operatorIdent.idText)
-        assertRange (2,8) (2,9) rpr
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``optional expression`` () =
-    let ast = getParseResults """
-f(?x = 7)
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Expr(expr =
-                                SynExpr.App(isInfix = false
-                                            funcExpr = SynExpr.Ident f
-                                            argExpr = SynExpr.Paren(
-                                                SynExpr.App(funcExpr = SynExpr.App(
-                                                                isInfix = true
-                                                                funcExpr = SynExpr.LongIdent(longDotId = SynLongIdent([eqIdent], _, [Some (IdentTrivia.OriginalNotation "=")]))
-                                                                argExpr = SynExpr.LongIdent(true, SynLongIdent([x], [], [None]), _, mOptional)
-                                                            )
-                                                            argExpr = SynExpr.Const(SynConst.Int32 7, _)), lpr, Some rpr, pr)))
-            ])
-        ])) ->
-        Assert.AreEqual("f", f.idText)
-        assertRange (2,1) (2,2) lpr
-        Assert.AreEqual("x", x.idText)
-        assertRange (2,3) (2, 4) mOptional
-        Assert.AreEqual("op_Equality", eqIdent.idText)
-        assertRange (2,8) (2,9) rpr
-        assertRange (2,1) (2,9) pr
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``object model with two members`` () =
-    let ast = getParseResults """
-type X() =
-    let mutable allowInto = 0
-    member _.AllowIntoPattern with get() = allowInto and set v = allowInto <- v
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types(typeDefns = [
-                SynTypeDefn.SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members =[
-                    SynMemberDefn.ImplicitCtor _
-                    SynMemberDefn.LetBindings _
-                    SynMemberDefn.GetSetMember(
-                        Some (SynBinding(headPat = SynPat.LongIdent(longDotId = SynLongIdent(id = [ _ ; allowIntoPatternGet ])))),
-                        Some (SynBinding(headPat = SynPat.LongIdent(longDotId = SynLongIdent(id = [ _ ; allowIntoPatternSet ])))),
-                        _,
-                        { WithKeyword = mWith; AndKeyword = Some mAnd })
-                ]))
-            ])
-        ])
-        ])) ->
-        Assert.AreEqual("AllowIntoPattern", allowIntoPatternGet.idText)
-        assertRange (4, 30) (4, 34) mWith
-        Assert.AreEqual("AllowIntoPattern", allowIntoPatternSet.idText)
-        assertRange (4, 53) (4, 56) mAnd
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``qualified operator expression`` () =
-    let ast = getParseResults """
-let PowByte (x:byte) n = Checked.( * ) x
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Let(bindings = [
-                SynBinding(expr = SynExpr.App(funcExpr =
-                    SynExpr.LongIdent(longDotId = SynLongIdent([checkedIdent; operatorIdent], [mDot], [None; Some (IdentTrivia.OriginalNotationWithParen(lpr, "*", rpr))]))))
-            ])
-        ])
-        ])) ->
-        Assert.AreEqual("Checked", checkedIdent.idText)
-        assertRange (2, 32) (2, 33) mDot
-        assertRange (2, 33) (2, 34) lpr
-        Assert.AreEqual("op_Multiply", operatorIdent.idText)
-        assertRange (2, 37) (2, 38) rpr
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
-
-[<Test>]
-let ``active pattern identifier in private member`` () =
-    let ast = getParseResults """
-type A() =
-    member private _.(|
-        A'
-    |) = (|
-        Lazy
-    |)
-"""
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types(typeDefns = [
-                SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                    SynMemberDefn.ImplicitCtor _
-                    SynMemberDefn.Member(memberDefn = SynBinding(
-                        headPat = SynPat.LongIdent(longDotId = SynLongIdent([underscoreIdent; aQuoteIdent], [ _ ], [ None; Some (IdentTrivia.HasParenthesis(lpr, rpr)) ]))
-                    ))
-                ]))
-            ])
-        ])
-        ])) ->
-        ()
-        Assert.AreEqual("_", underscoreIdent.idText)
-        Assert.AreEqual("|A'|", aQuoteIdent.idText)
-        assertRange (3, 21) (3, 22) lpr
-        assertRange (5, 5) (5, 6) rpr
-    | _ ->
-        Assert.Fail $"Could not get valid AST, got {ast}"
\ No newline at end of file
diff --git a/tests/service/SyntaxTreeTests/ParsedHashDirectiveTests.fs b/tests/service/SyntaxTreeTests/ParsedHashDirectiveTests.fs
deleted file mode 100644
index f834680fdff..00000000000
--- a/tests/service/SyntaxTreeTests/ParsedHashDirectiveTests.fs
+++ /dev/null
@@ -1,61 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.ParsedHashDirectiveTestsTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-
-[<Test>]
-let ``SourceIdentifier as ParsedHashDirectiveArgument`` () =
-    let parseResults = 
-        getParseResults
-            "#I __SOURCE_DIRECTORY__"
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.HashDirective(ParsedHashDirective("I", [ ParsedHashDirectiveArgument.SourceIdentifier(c,_,m) ] , _), _)
-    ]) ])) ->
-        Assert.AreEqual("__SOURCE_DIRECTORY__", c)
-        assertRange (1, 3) (1, 23) m
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Regular String as ParsedHashDirectiveArgument`` () =
-    let parseResults = 
-        getParseResults
-            "#I \"/tmp\""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.HashDirective(ParsedHashDirective("I", [ ParsedHashDirectiveArgument.String(v, SynStringKind.Regular, m) ] , _), _)
-    ]) ])) ->
-        Assert.AreEqual("/tmp", v)
-        assertRange (1, 3) (1, 9) m
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Verbatim String as ParsedHashDirectiveArgument`` () =
-    let parseResults = 
-        getParseResults
-            "#I @\"C:\\Temp\""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.HashDirective(ParsedHashDirective("I", [ ParsedHashDirectiveArgument.String(v, SynStringKind.Verbatim, m) ] , _), _)
-    ]) ])) ->
-        Assert.AreEqual("C:\\Temp", v)
-        assertRange (1, 3) (1, 13) m
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Triple quote String as ParsedHashDirectiveArgument`` () =
-    let parseResults = 
-        getParseResults
-            "#nowarn \"\"\"40\"\"\""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.HashDirective(ParsedHashDirective("nowarn", [ ParsedHashDirectiveArgument.String(v, SynStringKind.TripleQuote, m) ] , _), _)
-    ]) ])) ->
-        Assert.AreEqual("40", v)
-        assertRange (1, 8) (1, 16) m
-    | _ -> Assert.Fail "Could not get valid AST"
diff --git a/tests/service/SyntaxTreeTests/PatternTests.fs b/tests/service/SyntaxTreeTests/PatternTests.fs
deleted file mode 100644
index c03325e6077..00000000000
--- a/tests/service/SyntaxTreeTests/PatternTests.fs
+++ /dev/null
@@ -1,140 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.PatternTestsTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-[<Test>]
-let ``SynPat.Record contains the range of the equals sign`` () =
-    let parseResults = 
-        getParseResults
-            """
-match x with
-| { Foo = bar } -> ()
-| _ -> ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Match(clauses = [ SynMatchClause(pat = SynPat.Record(fieldPats = [ (_, mEquals, _) ])) ; _ ])
-        )
-    ]) ])) ->
-        assertRange (3, 8) (3, 9) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynArgPats.NamePatPairs contains the range of the equals sign`` () =
-    let parseResults = 
-        getParseResults
-            """
-match x with
-| X(Y  = y) -> y
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Match(clauses = [ SynMatchClause(pat = SynPat.LongIdent(argPats = SynArgPats.NamePatPairs(pats = [ _, mEquals ,_ ])))])
-        )
-    ]) ])) ->
-        assertRange (3, 7) (3, 8) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynPat.Or contains the range of the bar`` () =
-    let parseResults = 
-        getParseResults
-            """
-match x with
-| A
-| B -> ()
-| _ -> ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Match(clauses = [ SynMatchClause(pat = SynPat.Or(trivia={ BarRange = mBar })) ; _ ])
-        )
-    ]) ])) ->
-        assertRange (4, 0) (4, 1) mBar
-    | _ -> Assert.Fail "Could not get valid AST"
-    
-[<Test>]
-let ``:: operator in SynPat.LongIdent`` () =
-    let parseResults = 
-        getParseResults
-            """
-let (head::tail) =  [ 1;2;4]
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(
-            bindings = [ SynBinding(headPat = SynPat.Paren(pat = SynPat.ListCons(trivia = trivia))) ]
-        )
-    ]) ])) ->
-        assertRange (2,9) (2,11) trivia.ColonColonRange
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``:: operator in match pattern`` () =
-    let parseResults = 
-        getParseResults
-            """
-match x with
-| (head) :: (tail) -> ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Match(clauses = [
-                SynMatchClause(pat = SynPat.ListCons(trivia = trivia))
-            ])
-        )
-    ]) ])) ->
-        assertRange (3, 9) (3, 11) trivia.ColonColonRange
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``Parentheses of SynArgPats.NamePatPairs`` () =
-    let parseResults = 
-        getParseResults
-            """
-match data with
-| OnePartData( // foo
-    part1 = p1
-  (* bar *) ) -> p1
-| _ -> failwith "todo"
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(
-            expr = SynExpr.Match(clauses = [
-                SynMatchClause(pat = SynPat.LongIdent(argPats = SynArgPats.NamePatPairs(trivia = trivia)))
-                _
-            ])
-        )
-    ]) ])) ->
-        assertRange (3, 13) (5, 13) trivia.ParenRange
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``:: in head pattern`` () =
-    let parseResults =
-        getParseResults
-            """
-let 1 :: _ = [ 4; 5; 6 ]
-"""
-    
-    match  parseResults with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [ SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [ SynBinding(headPat =
-            SynPat.ListCons(trivia = trivia)) ])
-    ]) ])) ->
-        assertRange (2,6) (2, 8) trivia.ColonColonRange
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
diff --git a/tests/service/SyntaxTreeTests/SignatureTypeTests.fs b/tests/service/SyntaxTreeTests/SignatureTypeTests.fs
deleted file mode 100644
index d8a6857fbfb..00000000000
--- a/tests/service/SyntaxTreeTests/SignatureTypeTests.fs
+++ /dev/null
@@ -1,566 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.SignatureTypeTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-[<Test>]
-let ``Range of Type should end at end keyword`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """namespace GreatProjectThing
-
-type Meh =
-        class
-        end
-
-
-// foo"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [
-        SynModuleOrNamespaceSig(decls = [SynModuleSigDecl.Types(range = r)]) ])) ->
-        assertRange (3, 0) (5,11) r
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of SynTypeDefnSig record should end at last member`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """namespace X
-type MyRecord =
-    { Level: int }
-    member Score : unit -> int"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [
-        SynModuleOrNamespaceSig(decls = [SynModuleSigDecl.Types([SynTypeDefnSig.SynTypeDefnSig(range=mSynTypeDefnSig)], mTypes)]) ])) ->
-        assertRange (2, 0) (4, 30) mTypes
-        assertRange (2, 5) (4, 30) mSynTypeDefnSig
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of SynTypeDefnSig object model should end at last member`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """namespace X
-type MyRecord =
-    class
-    end
-    member Score : unit -> int"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [
-        SynModuleOrNamespaceSig(decls = [SynModuleSigDecl.Types([SynTypeDefnSig.SynTypeDefnSig(range=mSynTypeDefnSig)], mTypes)]) ])) ->
-        assertRange (2, 0) (5, 30) mTypes
-        assertRange (2, 5) (5, 30) mSynTypeDefnSig
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of SynTypeDefnSig delegate of should start from name`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """namespace Y
-type MyFunction =
-    delegate of int -> string"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [
-        SynModuleOrNamespaceSig(decls = [SynModuleSigDecl.Types([SynTypeDefnSig.SynTypeDefnSig(range=mSynTypeDefnSig)], mTypes) ]) ])) ->
-        assertRange (2, 0) (3, 29) mTypes
-        assertRange (2, 5) (3, 29) mSynTypeDefnSig
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of SynTypeDefnSig simple should end at last val`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """namespace Z
-type SomeCollection with
-    val LastIndex : int
-    val SomeThingElse : int -> string"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [
-        SynModuleOrNamespaceSig(decls = [SynModuleSigDecl.Types([SynTypeDefnSig.SynTypeDefnSig(range=mSynTypeDefnSig)], mTypes)]) ])) ->
-        assertRange (2, 0) (4, 37) mTypes
-        assertRange (2, 5) (4, 37) mSynTypeDefnSig
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute should be included in SynTypeDefnSig`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace SomeNamespace
-
-[<Foo1>]
-type MyType =
-    class
-    end
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [
-        SynModuleOrNamespaceSig(decls = [SynModuleSigDecl.Types(types = [SynTypeDefnSig.SynTypeDefnSig(range = r)]) as t]) ])) ->
-        assertRange (4, 0) (7, 7) r
-        assertRange (4, 0) (7, 7) t.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attributes should be included in recursive types`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace SomeNamespace
-
-type Foo =
-    | Bar
-
-and [<CustomEquality>] Bang =
-    internal
-        {
-            LongNameBarBarBarBarBarBarBar: int
-        }
-        override GetHashCode : unit -> int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [
-        SynModuleOrNamespaceSig(decls = [SynModuleSigDecl.Types([
-            SynTypeDefnSig.SynTypeDefnSig(range = r1)
-            SynTypeDefnSig.SynTypeDefnSig(range = r2)
-        ], mTypes)]) ])) ->
-        assertRange (4, 5) (5, 9) r1
-        assertRange (7, 4) (12, 42) r2
-        assertRange (4, 0) (12, 42) mTypes
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute should be included in SynValSpfn and Member`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace SomeNamespace
-
-type FooType =
-    [<Foo2>] // ValSpfn
-    abstract x : int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [
-        SynModuleOrNamespaceSig(decls =
-            [ SynModuleSigDecl.Types(types = [
-                SynTypeDefnSig.SynTypeDefnSig(typeRepr =
-                    SynTypeDefnSigRepr.ObjectModel(memberSigs = [
-                        SynMemberSig.Member(range = mr; memberSig = SynValSig(range = mv)) ]))
-            ]) ]) ])) ->
-        assertRange (5, 4) (6, 20) mr
-        assertRange (5, 4) (6, 20) mv
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefnSig with ObjectModel Delegate contains the range of the equals sign`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace Foo
-
-type X = delegate of string -> string
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [ SynModuleOrNamespaceSig(decls = [
-        SynModuleSigDecl.Types(
-            types = [ SynTypeDefnSig(trivia = { EqualsRange = Some mEquals }
-                                     typeRepr = SynTypeDefnSigRepr.ObjectModel(kind = SynTypeDefnKind.Delegate _)) ]
-        )
-    ]) ])) ->
-        assertRange (4, 7) (4, 8) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefnSig with ObjectModel class contains the range of the equals sign`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace SomeNamespace
-
-type Foobar =
-    class
-    end
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [ SynModuleOrNamespaceSig(decls = [
-        SynModuleSigDecl.Types(
-            types = [ SynTypeDefnSig(trivia = { EqualsRange = Some mEquals }
-                                     typeRepr = SynTypeDefnSigRepr.ObjectModel(kind = SynTypeDefnKind.Class)) ]
-        )
-    ]) ])) ->
-        assertRange (4, 12) (4, 13) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefnSig with Enum contains the range of the equals sign`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace SomeNamespace
-
-type Bear =
-    | BlackBear = 1
-    | PolarBear = 2
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [ SynModuleOrNamespaceSig(decls = [
-        SynModuleSigDecl.Types(
-            types = [ SynTypeDefnSig(trivia = { EqualsRange = Some mEquals }
-                                     typeRepr = SynTypeDefnSigRepr.Simple(repr =
-                                         SynTypeDefnSimpleRepr.Enum(cases = [
-                                            SynEnumCase(trivia={ EqualsRange = mEqualsEnumCase1 })
-                                            SynEnumCase(trivia={ EqualsRange = mEqualsEnumCase2 })
-                                     ]) )) ]
-        )
-    ]) ])) ->
-        assertRange (4, 10) (4, 11) mEquals
-        assertRange (5, 16) (5, 17) mEqualsEnumCase1
-        assertRange (6, 16) (6, 17) mEqualsEnumCase2
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefnSig with Union contains the range of the equals sign`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace SomeNamespace
-
-type Shape =
-| Square of int 
-| Rectangle of int * int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [ SynModuleOrNamespaceSig(decls = [
-        SynModuleSigDecl.Types(
-            types = [ SynTypeDefnSig(trivia = { EqualsRange = Some mEquals }
-                                     typeRepr = SynTypeDefnSigRepr.Simple(repr = SynTypeDefnSimpleRepr.Union _)) ]
-        )
-    ]) ])) ->
-        assertRange (4, 11) (4, 12) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefnSig should contains the range of the with keyword`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace X
-
-type Foo with
-member Meh : unit -> unit
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents =[ SynModuleOrNamespaceSig(decls =[
-        SynModuleSigDecl.Types(
-            types=[ SynTypeDefnSig(typeRepr=SynTypeDefnSigRepr.Simple _
-                                   trivia = { WithKeyword = Some mWithKeyword }) ]
-        )
-    ]) ])) ->
-        assertRange (4, 9) (4, 13) mWithKeyword
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynExceptionSig should contains the range of the with keyword`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace X
-
-exception Foo with
-member Meh : unit -> unit
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [ SynModuleOrNamespaceSig(decls = [
-        SynModuleSigDecl.Exception(
-            exnSig=SynExceptionSig(withKeyword = Some mWithKeyword)
-        )
-    ]) ])) ->
-        assertRange (4, 14) (4, 18) mWithKeyword
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``memberSig of SynMemberSig.Member should contains the range of the with keyword`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-namespace X
-
-type Foo =
-    abstract member Bar : int with get,set
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [ SynModuleOrNamespaceSig(decls = [
-        SynModuleSigDecl.Types(
-            types=[ SynTypeDefnSig(typeRepr=SynTypeDefnSigRepr.ObjectModel(memberSigs=[SynMemberSig.Member(memberSig=SynValSig(trivia = { WithKeyword = Some mWithKeyword }))])) ]
-        )
-    ]) ])) ->
-        assertRange (5, 30) (5, 34) mWithKeyword
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute should be included in SynExceptionDefnRepr and SynExceptionSig`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-module internal FSharp.Compiler.ParseHelpers
-
-// The error raised by the parse_error_rich function, which is called by the parser engine
-[<NoEquality; NoComparison>]
-exception SyntaxError of obj * range: range
-
-
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents=[
-        SynModuleOrNamespaceSig(decls=[
-            SynModuleSigDecl.Exception(
-                SynExceptionSig(exnRepr=SynExceptionDefnRepr(range=mSynExceptionDefnRepr); range=mSynExceptionSig), mException)
-        ] ) ])) ->
-        assertRange (5, 0) (6, 43) mSynExceptionDefnRepr
-        assertRange (5, 0) (6, 43) mSynExceptionSig
-        assertRange (5, 0) (6, 43) mException
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of members should be included in SynExceptionSig and SynModuleSigDecl.Exception`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-module internal FSharp.Compiler.ParseHelpers
-
-exception SyntaxError of obj * range: range with
-    member Meh : string -> int
-
-open Foo
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents=[
-        SynModuleOrNamespaceSig(decls=[
-            SynModuleSigDecl.Exception(
-                SynExceptionSig(exnRepr=SynExceptionDefnRepr(range=mSynExceptionDefnRepr); range=mSynExceptionSig), mException)
-            SynModuleSigDecl.Open _
-        ] ) ])) ->
-        assertRange (4, 0) (4, 43) mSynExceptionDefnRepr
-        assertRange (4, 0) (5, 30) mSynExceptionSig
-        assertRange (4, 0) (5, 30) mException
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Val keyword is present in SynValSig`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-module Meh
-
-[<Foo>]
-// meh
-val a : int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents=[
-        SynModuleOrNamespaceSig(decls=[
-            SynModuleSigDecl.Val(valSig = SynValSig(trivia = { LeadingKeyword = SynLeadingKeyword.Val mVal }))
-        ] ) ])) ->
-        assertRange (6, 0) (6, 3) mVal
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Equals token is present in SynValSig value`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-module Meh
-
-val a : int = 9
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents=[
-        SynModuleOrNamespaceSig(decls=[
-            SynModuleSigDecl.Val(valSig = SynValSig(trivia = { EqualsRange = Some mEquals }); range = mVal)
-        ] ) ])) ->
-        assertRange (4, 12) (4, 13) mEquals
-        assertRange (4, 0) (4, 15) mVal
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Equals token is present in SynValSig member`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-module Meh
-
-type X =
-    member a : int = 10
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents=[
-        SynModuleOrNamespaceSig(decls=[
-            SynModuleSigDecl.Types(types = [
-                SynTypeDefnSig(typeRepr = SynTypeDefnSigRepr.ObjectModel(memberSigs = [
-                    SynMemberSig.Member(memberSig = SynValSig(trivia = { EqualsRange = Some mEquals }); range = mMember)
-                ]))
-            ])
-        ] ) ])) ->
-        assertRange (5, 19) (5, 20) mEquals
-        assertRange (5, 4) (5, 23) mMember
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Trivia is present in SynTypeDefnSig`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-module Meh
-
-type X =
-    member a : int = 10
-
-/// Represents a line number when using zero-based line counting (used by Visual Studio)
-#if CHECK_LINE0_TYPES
-
-#else
-type Y = int
-#endif
-
-type Z with
-    static member P : int -> int
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents=[
-        SynModuleOrNamespaceSig(decls=[
-            SynModuleSigDecl.Types(types = [
-                SynTypeDefnSig(trivia = { LeadingKeyword = SynTypeDefnLeadingKeyword.Type mType1
-                                          EqualsRange = Some mEq1
-                                          WithKeyword = None }) ])
-            SynModuleSigDecl.Types(types = [
-                SynTypeDefnSig(trivia = { LeadingKeyword = SynTypeDefnLeadingKeyword.Type mType2
-                                          EqualsRange = Some mEq2
-                                          WithKeyword = None  }) ])
-            SynModuleSigDecl.Types(types = [
-                SynTypeDefnSig(trivia = { LeadingKeyword = SynTypeDefnLeadingKeyword.Type mType3
-                                          EqualsRange = None
-                                          WithKeyword = Some mWith3 }) ])
-        ] ) ])) ->
-        ()
-        assertRange (4, 0) (4, 4) mType1
-        assertRange (4, 7) (4, 8) mEq1
-        assertRange (11, 0) (11, 4) mType2
-        assertRange (11, 7) (11, 8) mEq2
-        assertRange (14, 0) (14, 4) mType3
-        assertRange (14, 7) (14, 11) mWith3
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``SynValSig contains parameter names`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """
-module Meh
-val InferSynValData:
-    memberFlagsOpt: SynMemberFlags option * pat: SynPat option * SynReturnInfo option * origRhsExpr: SynExpr ->
-        x: string ->
-            SynValData2
-"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents=[
-        SynModuleOrNamespaceSig(decls=[
-            SynModuleSigDecl.Val(valSig = SynValSig(synType =
-                    SynType.Fun(
-                        argType =
-                            SynType.Tuple(path = [
-                                SynTupleTypeSegment.Type(SynType.SignatureParameter(id = Some memberFlagsOpt))
-                                SynTupleTypeSegment.Star _
-                                SynTupleTypeSegment.Type(SynType.SignatureParameter(id = Some pat))
-                                SynTupleTypeSegment.Star _
-                                SynTupleTypeSegment.Type(SynType.App _)
-                                SynTupleTypeSegment.Star _
-                                SynTupleTypeSegment.Type(SynType.SignatureParameter(id = Some origRhsExpr))
-                            ])
-                        returnType =
-                            SynType.Fun(
-                                argType = SynType.SignatureParameter(id = Some x)
-                                returnType = SynType.LongIdent _
-                            )
-                    )
-                ))
-        ] ) ])) ->
-        Assert.AreEqual("memberFlagsOpt", memberFlagsOpt.idText)
-        Assert.AreEqual("pat", pat.idText)
-        Assert.AreEqual("origRhsExpr", origRhsExpr.idText)
-        Assert.AreEqual("x", x.idText)
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``Leading keyword in recursive types`` () =
-    let parseResults =
-        getParseResultsOfSignatureFile
-             """
-type A = obj
-and B = int
- """
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput(contents = [
-        SynModuleOrNamespaceSig(decls = [
-            SynModuleSigDecl.Types(types = [
-                SynTypeDefnSig(trivia = { LeadingKeyword = SynTypeDefnLeadingKeyword.Type mType })
-                SynTypeDefnSig(trivia = { LeadingKeyword = SynTypeDefnLeadingKeyword.And mAnd })
-            ])
-        ])
-    ])) ->
-        assertRange (2, 0) (2, 4) mType
-        assertRange (3, 0) (3, 3) mAnd
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-
-[<Test>]
-let ``Nested type has static type as leading keyword`` () =
-    let parseResults =
-        getParseResultsOfSignatureFile
-             """
-type A =
-    static type B =
-                    class
-                    end
- """
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput(contents = [
-        SynModuleOrNamespaceSig(decls = [
-            SynModuleSigDecl.Types(types = [
-                SynTypeDefnSig(typeRepr = SynTypeDefnSigRepr.ObjectModel(
-                    memberSigs = [
-                        SynMemberSig.NestedType(nestedType =
-                            SynTypeDefnSig(trivia = { LeadingKeyword = SynTypeDefnLeadingKeyword.StaticType(mStatic, mType) }))
-                    ]
-                ))
-            ])
-        ])
-    ])) ->
-        assertRange (3, 4) (3, 10) mStatic
-        assertRange (3, 11) (3, 15) mType
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
diff --git a/tests/service/SyntaxTreeTests/SourceIdentifierTests.fs b/tests/service/SyntaxTreeTests/SourceIdentifierTests.fs
deleted file mode 100644
index f7d96c3a7ea..00000000000
--- a/tests/service/SyntaxTreeTests/SourceIdentifierTests.fs
+++ /dev/null
@@ -1,48 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.SourceIdentifierTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-
-
-[<Test>]
-let ``__LINE__`` () =
-    let parseResults = 
-        getParseResults
-            """
-__LINE__"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.Const(SynConst.SourceIdentifier("__LINE__", "2", range), _))
-    ]) ])) ->
-        assertRange (2, 0) (2, 8) range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``__SOURCE_DIRECTORY__`` () =
-    let parseResults = 
-        getParseResults
-            """
-__SOURCE_DIRECTORY__"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.Const(SynConst.SourceIdentifier("__SOURCE_DIRECTORY__", _, range), _))
-    ]) ])) ->
-        assertRange (2, 0) (2, 20) range
-    | _ -> Assert.Fail "Could not get valid AST"
-    
-[<Test>]
-let ``__SOURCE_FILE__`` () =
-    let parseResults = 
-        getParseResults
-            """
-__SOURCE_FILE__"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Expr(expr = SynExpr.Const(SynConst.SourceIdentifier("__SOURCE_FILE__", _, range), _))
-    ]) ])) ->
-        assertRange (2, 0) (2, 15) range
-    | _ -> Assert.Fail "Could not get valid AST"
diff --git a/tests/service/SyntaxTreeTests/StringTests.fs b/tests/service/SyntaxTreeTests/StringTests.fs
deleted file mode 100644
index c562b2450a6..00000000000
--- a/tests/service/SyntaxTreeTests/StringTests.fs
+++ /dev/null
@@ -1,121 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.StringTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-open FsUnit
-
-let private getBindingExpressionValue (parseResults: ParsedInput) =
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = modules)) ->
-        modules |> List.tryPick (fun (SynModuleOrNamespace (decls = decls)) ->
-            decls |> List.tryPick (fun decl ->
-                match decl with
-                | SynModuleDecl.Let (bindings = bindings) ->
-                    bindings |> List.tryPick (fun binding ->
-                        match binding with
-                        | SynBinding.SynBinding (headPat=(SynPat.Named _|SynPat.As(_,SynPat.Named _,_)); expr=e) -> Some e
-                        | _ -> None)
-                | _ -> None))
-    | _ -> None
-
-let private getBindingConstValue parseResults =
-    match getBindingExpressionValue parseResults with
-    | Some (SynExpr.Const(c,_)) -> Some c
-    | _ -> None
-
-[<Test>]
-let ``SynConst.String with SynStringKind.Regular`` () =
-    let parseResults =
-        getParseResults
-            """
-let s = "yo"
-"""
-
-    match getBindingConstValue parseResults with
-    | Some (SynConst.String (_,  kind, _)) -> kind |> should equal SynStringKind.Regular
-    | _ -> Assert.Fail "Couldn't find const"
-
-[<Test>]
-let ``SynConst.String with SynStringKind.Verbatim`` () =
-    let parseResults =
-        getParseResults
-            """
-let s = @"yo"
-"""
-
-    match getBindingConstValue parseResults with
-    | Some (SynConst.String (_,  kind, _)) -> kind |> should equal SynStringKind.Verbatim
-    | _ -> Assert.Fail "Couldn't find const"
-
-[<Test>]
-let ``SynConst.String with SynStringKind.TripleQuote`` () =
-    let parseResults =
-        getParseResults
-            "
-let s = \"\"\"yo\"\"\"
-"
-
-    match getBindingConstValue parseResults with
-    | Some (SynConst.String (_,  kind, _)) -> kind |> should equal SynStringKind.TripleQuote
-    | _ -> Assert.Fail "Couldn't find const"
-
-[<Test>]
-let ``SynConst.Bytes with SynByteStringKind.Regular`` () =
-    let parseResults =
-        getParseResults
-            """
-let bytes = "yo"B
-"""
-
-    match getBindingConstValue parseResults with
-    | Some (SynConst.Bytes (_,  kind, _)) -> kind |> should equal SynByteStringKind.Regular
-    | _ -> Assert.Fail "Couldn't find const"
-
-[<Test>]
-let ``SynConst.Bytes with SynByteStringKind.Verbatim`` () =
-    let parseResults =
-        getParseResults
-            """
-let bytes = @"yo"B
-"""
-
-    match getBindingConstValue parseResults with
-    | Some (SynConst.Bytes (_,  kind, _)) -> kind |> should equal SynByteStringKind.Verbatim
-    | _ -> Assert.Fail "Couldn't find const"
-
-[<Test>]
-let ``SynExpr.InterpolatedString with SynStringKind.TripleQuote`` () =
-    let parseResults =
-        getParseResults
-            "
-let s = $\"\"\"yo {42}\"\"\"
-"
-
-    match getBindingExpressionValue parseResults with
-    | Some (SynExpr.InterpolatedString(_,  kind, _)) -> kind |> should equal SynStringKind.TripleQuote
-    | _ -> Assert.Fail "Couldn't find const"
-
-[<Test>]
-let ``SynExpr.InterpolatedString with SynStringKind.Regular`` () =
-    let parseResults =
-        getParseResults
-            """
-let s = $"yo {42}"
-"""
-
-    match getBindingExpressionValue parseResults with
-    | Some (SynExpr.InterpolatedString(_,  kind, _)) -> kind |> should equal SynStringKind.Regular
-    | _ -> Assert.Fail "Couldn't find const"
-
-[<Test>]
-let ``SynExpr.InterpolatedString with SynStringKind.Verbatim`` () =
-    let parseResults =
-        getParseResults
-            """
-let s = $@"Migrate notes of file ""{oldId}"" to new file ""{newId}""."
-"""
-
-    match getBindingExpressionValue parseResults with
-    | Some (SynExpr.InterpolatedString(_,  kind, _)) -> kind |> should equal SynStringKind.Verbatim
-    | _ -> Assert.Fail "Couldn't find const"
diff --git a/tests/service/SyntaxTreeTests/SynIdentTests.fs b/tests/service/SyntaxTreeTests/SynIdentTests.fs
deleted file mode 100644
index 500e3e76ed4..00000000000
--- a/tests/service/SyntaxTreeTests/SynIdentTests.fs
+++ /dev/null
@@ -1,31 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.SynIdentTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.Text
-open NUnit.Framework
-
-[<Test>]
-let ``Incomplete long ident`` () =
-    let ast =
-        """
-module Module
-
-A.
-"""
-        |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile (ParsedImplFileInput(contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls =
-        [ SynModuleDecl.Expr(expr = SynExpr.LongIdent (longDotId = lid)) ]) ])) ->
-        Assert.AreEqual(1, lid.IdentsWithTrivia.Length)
-    | _ -> Assert.Fail $"Could not get valid AST, got {ast}"
-
-// [<Test>]
-// let ``IdentsWithTrivia with unbalance collection should not throw`` () =
-//     let synLongIdent =
-//         SynLongIdent([ Ident("A", Range.Zero); Ident("B", Range.Zero) ], [ Range.Zero ], [ None ])
-//
-//     match synLongIdent.IdentsWithTrivia with
-//     | [ SynIdent (_, None); SynIdent (_, None) ] -> Assert.Pass()
-//     | identsWithTrivia -> Assert.Fail $"Unexpected identsWithTrivia, got {identsWithTrivia}"
diff --git a/tests/service/SyntaxTreeTests/SynTypeTests.fs b/tests/service/SyntaxTreeTests/SynTypeTests.fs
deleted file mode 100644
index 7f18521a995..00000000000
--- a/tests/service/SyntaxTreeTests/SynTypeTests.fs
+++ /dev/null
@@ -1,207 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.SynTypeTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-
-[<Test>]
-let ``SynType.Tuple does include leading parameter name`` () =
-    let parseResults =
-        getParseResultsOfSignatureFile
-             """
-type T =
-    member M: p1: a * p2: b -> int
- """
-
-    match parseResults with
-    | ParsedInput.SigFile(ParsedSigFileInput(contents = [
-        SynModuleOrNamespaceSig(decls = [
-            SynModuleSigDecl.Types(types = [
-                SynTypeDefnSig(typeRepr = SynTypeDefnSigRepr.ObjectModel(memberSigs = [
-                    SynMemberSig.Member(memberSig = SynValSig(synType =
-                        SynType.Fun(argType = SynType.Tuple(_, _, mTuple))))
-                ]))
-            ])
-        ])
-      ])) ->
-        assertRange (3, 14) (3, 27) mTuple
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``SynType.Tuple does include leading parameter attributes`` () =
-    let parseResults =
-        getParseResultsOfSignatureFile
-             """
-type T =
-    member M: [<SomeAttribute>] a * [<OtherAttribute>] b -> int
- """
-
-    match parseResults with
-    | ParsedInput.SigFile(ParsedSigFileInput(contents = [
-        SynModuleOrNamespaceSig(decls = [
-            SynModuleSigDecl.Types(types = [
-                SynTypeDefnSig(typeRepr = SynTypeDefnSigRepr.ObjectModel(memberSigs = [
-                    SynMemberSig.Member(memberSig = SynValSig(synType =
-                        SynType.Fun(argType = SynType.Tuple(_, _, mTuple))))
-                ]))
-            ])
-        ])
-      ])) ->
-        assertRange (3, 14) (3, 56) mTuple
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``SynType.Or inside SynExpr.TraitCall`` () =
-    let parseResults =
-        getParseResults
-             """
-let inline (!!) (x: ^a) : ^b = ((^a or ^b): (static member op_Implicit: ^a -> ^b) x)
- """
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [
-            SynBinding(expr =
-                SynExpr.Typed(expr =
-                    SynExpr.Paren(expr =
-                        SynExpr.TraitCall(supportTys =
-                            SynType.Paren(
-                                SynType.Or(
-                                    SynType.Var(range = mVar1),
-                                    SynType.Var(range = mVar2),
-                                    mOrType,
-                                    { OrKeyword = mOrWord }),
-                            mParen))
-                    )))
-        ]) ]) ])) ->
-        assertRange (2, 33) (2, 35) mVar1
-        assertRange (2, 36) (2, 38) mOrWord
-        assertRange (2, 39) (2, 41) mVar2
-        assertRange (2, 33) (2, 41) mOrType
-        assertRange (2, 32) (2, 42) mParen
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``SynType.Or inside SynTypeConstraint.WhereTyparSupportsMember`` () =
-    let parseResults =
-        getParseResults
-             """
-let inline f_StaticMethod<'T1, 'T2 when ('T1 or 'T2) : (static member StaticMethod: int -> int) >() : int = 
-    ()
- """
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [
-            SynBinding(headPat =
-                SynPat.LongIdent(typarDecls = Some (SynValTyparDecls(typars = Some (SynTyparDecls.PostfixList(constraints = [
-                    SynTypeConstraint.WhereTyparSupportsMember(typars = SynType.Paren(
-                        SynType.Or(
-                            SynType.Var(range = mVar1),
-                            SynType.Var(range = mVar2),
-                            mOrType,
-                            { OrKeyword = mOrWord }),
-                        mParen
-                    ))
-                ]))))))
-        ]) ]) ])) ->
-        assertRange (2, 41) (2, 44) mVar1
-        assertRange (2, 45) (2, 47) mOrWord
-        assertRange (2, 48) (2, 51) mVar2
-        assertRange (2, 41) (2, 51) mOrType
-        assertRange (2, 40) (2, 52) mParen
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``Nested SynType.Or inside SynExpr.TraitCall`` () =
-    let parseResults =
-        getParseResults
-             """
-let inline (!!) (x: ^a * ^b) : ^c = ((^a or ^b or ^c): (static member op_Implicit: ^a * ^b -> ^c) x)
- """
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [
-            SynBinding(expr =
-                SynExpr.Typed(expr =
-                    SynExpr.Paren(expr =
-                        SynExpr.TraitCall(supportTys =
-                            SynType.Paren(
-                                SynType.Or(
-                                    SynType.Or(
-                                        SynType.Var(range = mVarA),
-                                        SynType.Var(range = mVarB),
-                                        mOrType1,
-                                        { OrKeyword = mOrWord1 }
-                                    ),
-                                    SynType.Var(range = mVarC),
-                                    mOrType2,
-                                    { OrKeyword = mOrWord2 }),
-                            mParen))
-                    )))
-        ]) ]) ])) ->
-        assertRange (2, 38) (2, 40) mVarA
-        assertRange (2, 41) (2, 43) mOrWord1
-        assertRange (2, 44) (2, 46) mVarB
-        assertRange (2, 38) (2, 46) mOrType1
-        assertRange (2, 47) (2, 49) mOrWord2
-        assertRange (2, 50) (2, 52) mVarC
-        assertRange (2, 38) (2, 52) mOrType2
-        assertRange (2, 37) (2, 53) mParen
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-    
-[<Test>]
-let ``Single SynType inside SynExpr.TraitCall`` () =
-    let parseResults =
-        getParseResults
-             """
-type X =
-    static member inline replace< ^a, ^b, ^c when ^b: (static member replace: ^a * ^b -> ^c)>(a: ^a, f: ^b) =
-        (^b : (static member replace: ^a * ^b -> ^c) (a, f))
- """
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [
-            SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members = [
-                SynMemberDefn.Member(memberDefn =
-                    SynBinding(expr =
-                            SynExpr.Paren(expr =
-                                SynExpr.TraitCall(supportTys =
-                                    SynType.Var(range = mVar))
-                    )))
-            ]))
-        ]) ]) ])) ->
-        assertRange (4, 9) (4, 11) mVar
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``SynType.Or with appType on the right hand side`` () =
-    let parseResults =
-        getParseResults
-             """
-let inline f (x: 'T) = ((^T or int) : (static member A: int) ())
- """
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Let(bindings = [
-            SynBinding(expr =
-                    SynExpr.Paren(expr =
-                        SynExpr.TraitCall(supportTys =
-                            SynType.Paren(
-                                SynType.Or(
-                                    SynType.Var(range = mVar),
-                                    (SynType.LongIdent _ as appType),
-                                    mOrType,
-                                    { OrKeyword = mOrWord }),
-                            mParen))
-                    ))
-        ]) ]) ])) ->
-        assertRange (2, 25) (2,27) mVar
-        assertRange (2, 28) (2, 30) mOrWord
-        assertRange (2, 31) (2, 34) appType.Range
-        assertRange (2,25) (2, 34) mOrType
-        assertRange (2,24) (2, 35) mParen
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
diff --git a/tests/service/SyntaxTreeTests/TypeTests.fs b/tests/service/SyntaxTreeTests/TypeTests.fs
deleted file mode 100644
index 37fe10678fc..00000000000
--- a/tests/service/SyntaxTreeTests/TypeTests.fs
+++ /dev/null
@@ -1,432 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.TypeTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-[<Test>]
-let ``Single SynEnumCase contains range of constant`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Foo = One = 0x00000001
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [
-            SynTypeDefn.SynTypeDefn(typeRepr =
-                SynTypeDefnRepr.Simple(simpleRepr = SynTypeDefnSimpleRepr.Enum(cases = [ SynEnumCase.SynEnumCase(valueExpr = e) ])))])
-    ]) ])) ->
-        assertRange (2, 17) (2, 27) e.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-    
-[<Test>]
-let ``Multiple SynEnumCase contains range of constant`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Foo =
-    | One =  0x00000001
-    | Two = 2
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [
-            SynTypeDefn.SynTypeDefn(typeRepr =
-                SynTypeDefnRepr.Simple(simpleRepr = SynTypeDefnSimpleRepr.Enum(cases = [ SynEnumCase.SynEnumCase(valueExpr = e1)
-                                                                                         SynEnumCase.SynEnumCase(valueExpr = e2) ])))])
-    ]) ])) ->
-        assertRange (3, 13) (3, 23) e1.Range
-        assertRange (4, 12) (4, 13) e2.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attribute should be included in SynTypeDefn`` () =
-    let parseResults = 
-        getParseResults
-            """
-[<Foo>]
-type Bar =
-    class
-    end"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [t]) as types
-    ]) ])) ->
-        assertRange (2, 0) (5, 7) types.Range
-        assertRange (2, 0) (5, 7) t.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``Range of attributes should be included in recursive types`` () =
-    let parseResults = 
-        getParseResults
-            """
-[<NoEquality ; NoComparison>]
-type Foo<'context, 'a> =
-    | Apply of ApplyCrate<'context, 'a>
-
-and [<CustomEquality ; NoComparison>] Bar<'context, 'a> =
-    internal {
-        Hash : int
-        Foo : Foo<'a, 'b>
-    }"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(typeDefns = [t1;t2]) as types
-    ]) ])) ->
-        assertRange (2, 0) (10, 5) types.Range
-        assertRange (2, 0) (4, 39) t1.Range
-        assertRange (6, 4) (10, 5) t2.Range
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefn with ObjectModel Delegate contains the range of the equals sign`` () =
-    let parseResults = 
-        getParseResults
-            """
-type X = delegate of string -> string
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(kind = SynTypeDefnKind.Delegate _)
-                                      trivia={ EqualsRange = Some mEquals }) ]
-        )
-    ]) ])) ->
-        assertRange (2, 7) (2, 8) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefn with ObjectModel class contains the range of the equals sign`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Foobar () =
-    class
-    end
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(kind = SynTypeDefnKind.Class)
-                                      trivia={ EqualsRange = Some mEquals }) ]
-        )
-    ]) ])) ->
-        assertRange (2, 15) (2, 16) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefn with Enum contains the range of the equals sign`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Bear =
-    | BlackBear = 1
-    | PolarBear = 2
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.Simple(simpleRepr =
-                                          SynTypeDefnSimpleRepr.Enum(cases = [
-                                              SynEnumCase(trivia={ EqualsRange = mEqualsEnumCase1 })
-                                              SynEnumCase(trivia={ EqualsRange = mEqualsEnumCase2 })
-                                          ]))
-                                      trivia={ EqualsRange = Some mEquals }) ]
-        )
-    ]) ])) ->
-        assertRange (2, 10) (2, 11) mEquals
-        assertRange (3, 16) (3, 17) mEqualsEnumCase1
-        assertRange (4, 16) (4, 17) mEqualsEnumCase2
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefn with Union contains the range of the equals sign`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Shape =
-    | Square of int 
-    | Rectangle of int * int
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.Simple(simpleRepr = SynTypeDefnSimpleRepr.Union _)
-                                      trivia={ EqualsRange = Some mEquals }) ]
-        )
-    ]) ])) ->
-        assertRange (2, 11) (2, 12) mEquals
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefn with Record contains the range of the with keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Foo =
-    { Bar : int }
-    with
-        member this.Meh (v:int) = this.Bar + v
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr=SynTypeDefnRepr.Simple(simpleRepr= SynTypeDefnSimpleRepr.Record _)
-                                      trivia={ WithKeyword = Some mWithKeyword }) ]
-        )
-    ]) ])) ->
-        assertRange (4, 4) (4, 8) mWithKeyword
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefn with Augmentation contains the range of the with keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Int32 with
-    member _.Zero = 0
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(kind=SynTypeDefnKind.Augmentation mWithKeyword)) ]
-        )
-    ]) ])) ->
-        assertRange (2, 11) (2, 15) mWithKeyword
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynMemberDefn.Interface contains the range of the with keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-type Foo() =
-    interface Bar with
-        member Meh () = ()
-    interface Other
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(members=[ SynMemberDefn.ImplicitCtor _
-                                                                                       SynMemberDefn.Interface(withKeyword=Some mWithKeyword)
-                                                                                       SynMemberDefn.Interface(withKeyword=None) ])) ]
-        )
-    ]) ])) ->
-        assertRange (3, 18) (3, 22) mWithKeyword
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynTypeDefn with XmlDoc contains the range of the type keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-/// Doc
-// noDoc
-type A = B
-and C = D
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(trivia={ LeadingKeyword = SynTypeDefnLeadingKeyword.Type mType })
-                          SynTypeDefn(trivia={ LeadingKeyword = SynTypeDefnLeadingKeyword.And mAnd }) ]
-        )
-    ]) ])) ->
-        assertRange (4, 0) (4, 4) mType
-        assertRange (5, 0) (5, 3) mAnd
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``SynTypeDefn with attribute contains the range of the type keyword`` () =
-    let parseResults = 
-        getParseResults
-            """
-[<MyAttribute>]
-// noDoc
-type A = B
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput (contents = [ SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-        SynModuleDecl.Types(
-            typeDefns = [ SynTypeDefn(trivia={ LeadingKeyword = SynTypeDefnLeadingKeyword.Type mType }) ]
-        )
-    ]) ])) ->
-        assertRange (4, 0) (4, 4) mType
-    | _ -> Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynType.Fun has range of arrow`` () =
-    let parseResults =
-        getParseResults
-             """
-     type X = string -> // after a tuple, mixed needs an indent 
-                 int
- """
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types(typeDefns = [
-                SynTypeDefn(typeRepr = SynTypeDefnRepr.Simple(simpleRepr =
-                    SynTypeDefnSimpleRepr.TypeAbbrev(rhsType =
-                        SynType.Fun(trivia = { ArrowRange = mArrow }))))
-            ])
-        ])
-    ])) ->
-        assertRange (2, 21) (2, 23) mArrow
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``SynType.Tuple with struct`` () =
-    let parseResults =
-        getParseResults
-            """
-let _: struct (int * int) = ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Let(bindings = [ SynBinding(returnInfo = Some (SynBindingReturnInfo(typeName =
-                SynType.Tuple(true, [ SynTupleTypeSegment.Type _ ; SynTupleTypeSegment.Star _ ; SynTupleTypeSegment.Type _ ], mTuple)))) ])
-            ])
-        ])
-     ) ->
-        assertRange (2, 7) (2, 25) mTuple
-
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``SynType.Tuple with struct, recovery`` () =
-    let parseResults =
-        getParseResults
-            """
-let _: struct (int * int = ()
-"""
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Let(bindings = [ SynBinding(returnInfo = Some (SynBindingReturnInfo(typeName =
-                SynType.Tuple(true, [ SynTupleTypeSegment.Type _ ; SynTupleTypeSegment.Star _ ; SynTupleTypeSegment.Type _ ], mTuple)))) ])
-            ])
-        ])
-     ) ->
-        assertRange (2, 7) (2, 24) mTuple
-
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``Named parameters in delegate type`` () =
-    let parseResults =
-        getParseResults
-             """
-type Foo = delegate of a: A * b: B -> c:C -> D
- """
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types(typeDefns = [
-                SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(kind =
-                    SynTypeDefnKind.Delegate(signature = SynType.Fun(
-                        argType =
-                            SynType.Tuple(path = [
-                                SynTupleTypeSegment.Type(SynType.SignatureParameter(id = Some a))
-                                SynTupleTypeSegment.Star _
-                                SynTupleTypeSegment.Type(SynType.SignatureParameter(id = Some b))
-                            ])
-                        returnType =
-                            SynType.Fun(
-                                argType = SynType.SignatureParameter(id = Some c)
-                                returnType = SynType.LongIdent _
-                            )
-                    ))))
-            ])
-        ])
-    ])) ->
-        Assert.AreEqual("a", a.idText)
-        Assert.AreEqual("b", b.idText)
-        Assert.AreEqual("c", c.idText)
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``Attributes in optional named member parameter`` () =
-    let parseResults =
-        getParseResults
-             """
-type X =
-    abstract member Y: [<Foo; Bar>] ?a: A -> B
- """
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types(typeDefns = [
-                SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(
-                    members = [
-                        SynMemberDefn.AbstractSlot(slotSig = SynValSig(synType =
-                            SynType.Fun(
-                                argType = SynType.SignatureParameter(
-                                    [ { Attributes = [ _ ; _ ] } ],
-                                    true,
-                                    Some a,
-                                    SynType.LongIdent _,
-                                    m
-                                )
-                                returnType = SynType.LongIdent _
-                            )
-                        ))
-                    ]
-                ))
-            ])
-        ])
-    ])) ->
-        Assert.AreEqual("a", a.idText)
-        assertRange (3, 23) (3, 41) m
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
-
-[<Test>]
-let ``Nested type has static type as leading keyword`` () =
-    let parseResults =
-        getParseResults
-             """
-type A =
-    static type B =
-                    class
-                    end
- """
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types(typeDefns = [
-                SynTypeDefn(typeRepr = SynTypeDefnRepr.ObjectModel(
-                    members = [
-                        SynMemberDefn.NestedType(typeDefn =
-                            SynTypeDefn(trivia = { LeadingKeyword = SynTypeDefnLeadingKeyword.StaticType(mStatic, mType) }))
-                    ]
-                ))
-            ])
-        ])
-    ])) ->
-        assertRange (3, 4) (3, 10) mStatic
-        assertRange (3, 11) (3, 15) mType
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
diff --git a/tests/service/SyntaxTreeTests/UnionCaseTests.fs b/tests/service/SyntaxTreeTests/UnionCaseTests.fs
deleted file mode 100644
index c40a3ecc232..00000000000
--- a/tests/service/SyntaxTreeTests/UnionCaseTests.fs
+++ /dev/null
@@ -1,165 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.UnionCaseTestsTests
-
-open System
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open NUnit.Framework
-
-[<Test>]
-let ``Union Case fields can have comments`` () =
-    let ast = """
-type Foo =
-/// docs for Thing
-| Thing of
-  /// docs for first
-  first: string *
-  /// docs for anon field
-  bool
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types ([
-                SynTypeDefn.SynTypeDefn (typeRepr = SynTypeDefnRepr.Simple (simpleRepr = SynTypeDefnSimpleRepr.Union(unionCases = [
-                    SynUnionCase.SynUnionCase (caseType = SynUnionCaseKind.Fields [
-                        SynField.SynField(xmlDoc = firstXml)
-                        SynField.SynField(xmlDoc = anonXml)
-                    ])
-                ])))
-            ], _)
-        ])
-      ])) ->
-        let firstDocs = firstXml.ToXmlDoc(false, None).GetXmlText()
-        let anonDocs = anonXml.ToXmlDoc(false, None).GetXmlText()
-
-        let nl = Environment.NewLine
-
-        Assert.AreEqual($"<summary>{nl} docs for first{nl}</summary>", firstDocs)
-        Assert.AreEqual($"<summary>{nl} docs for anon field{nl}</summary>", anonDocs)
-
-    | _ ->
-        failwith "Could not find SynExpr.Do"
-
-[<Test>]
-let ``single SynUnionCase has bar range`` () =
-    let ast = """
-type Foo = | Bar of string
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types ([
-                SynTypeDefn.SynTypeDefn (typeRepr = SynTypeDefnRepr.Simple (simpleRepr = SynTypeDefnSimpleRepr.Union(unionCases = [
-                    SynUnionCase.SynUnionCase (trivia = { BarRange = Some mBar })
-                ])))
-            ], _)
-        ])
-      ])) ->
-        assertRange (2, 11) (2, 12) mBar
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``multiple SynUnionCases have bar range`` () =
-    let ast = """
-type Foo =
-    | Bar of string
-    | Bear of int
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types ([
-                SynTypeDefn.SynTypeDefn (typeRepr = SynTypeDefnRepr.Simple (simpleRepr = SynTypeDefnSimpleRepr.Union(unionCases = [
-                    SynUnionCase.SynUnionCase (trivia = { BarRange = Some mBar1 })
-                    SynUnionCase.SynUnionCase (trivia = { BarRange = Some mBar2 })
-                ])))
-            ], _)
-        ])
-      ])) ->
-        assertRange (3, 4) (3, 5) mBar1
-        assertRange (4, 4) (4, 5) mBar2
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``single SynUnionCase without bar`` () =
-    let ast = """
-type Foo = Bar of string
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types ([
-                SynTypeDefn.SynTypeDefn (typeRepr = SynTypeDefnRepr.Simple (simpleRepr = SynTypeDefnSimpleRepr.Union(unionCases = [
-                    SynUnionCase.SynUnionCase (trivia = { BarRange = None })
-                ])))
-            ], _)
-        ])
-      ])) ->
-        Assert.Pass()
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``private keyword has range`` () =
-    let ast = """
-type Currency =
-    // Temporary fix until a new Thoth.Json.Net package is released
-    // See https://github.com/MangelMaxime/Thoth/pull/70
-
-#if !FABLE_COMPILER
-    private
-#endif
-    | Code of string
-"""
-                    |> getParseResults
-
-    match ast with
-    | ParsedInput.ImplFile(ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types ([
-                SynTypeDefn.SynTypeDefn (typeRepr = SynTypeDefnRepr.Simple (simpleRepr = SynTypeDefnSimpleRepr.Union(
-                    accessibility = Some (SynAccess.Private mPrivate)
-                    unionCases = [ SynUnionCase.SynUnionCase _ ])))
-            ], _)
-        ])
-      ])) ->
-        assertRange (7, 4) (7, 11) mPrivate
-    | _ ->
-        Assert.Fail "Could not get valid AST"
-
-[<Test>]
-let ``SynUnionCaseKind.FullType`` () =
-    let parseResults =
-        getParseResults
-             """
-type X =
-    | a: int * z:int
- """
-
-    match parseResults with
-    | ParsedInput.ImplFile (ParsedImplFileInput(contents = [
-        SynModuleOrNamespace.SynModuleOrNamespace(decls = [
-            SynModuleDecl.Types(typeDefns = [
-                SynTypeDefn(typeRepr = SynTypeDefnRepr.Simple(simpleRepr =
-                    SynTypeDefnSimpleRepr.Union(unionCases = [
-                        SynUnionCase(caseType = SynUnionCaseKind.FullType(fullType = SynType.Tuple(path = [
-                            SynTupleTypeSegment.Type(SynType.LongIdent _)
-                            SynTupleTypeSegment.Star _
-                            SynTupleTypeSegment.Type(SynType.SignatureParameter(id = Some z))
-                        ])))
-                    ])))
-            ])
-        ])
-    ])) ->
-        Assert.AreEqual("z", z.idText)
-    | _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"
\ No newline at end of file
diff --git a/tests/service/SyntaxTreeTests/ValTests.fs b/tests/service/SyntaxTreeTests/ValTests.fs
deleted file mode 100644
index c14415bad6e..00000000000
--- a/tests/service/SyntaxTreeTests/ValTests.fs
+++ /dev/null
@@ -1,20 +0,0 @@
-module FSharp.Compiler.Service.Tests.SyntaxTreeTests.ValTests
-
-open FSharp.Compiler.Service.Tests.Common
-open FSharp.Compiler.Syntax
-open FSharp.Compiler.SyntaxTrivia
-open NUnit.Framework
-
-[<Test>]
-let ``Inline keyword`` () =
-    let parseResults = 
-        getParseResultsOfSignatureFile
-            """namespace X
-
-val inline meh: int -> int"""
-
-    match parseResults with
-    | ParsedInput.SigFile (ParsedSigFileInput (contents = [
-        SynModuleOrNamespaceSig(decls = [SynModuleSigDecl.Val(valSig = SynValSig(trivia = { InlineKeyword = Some mInline }))]) ])) ->
-        assertRange (3, 4) (3,10) mInline
-    | ast -> Assert.Fail $"Could not get valid AST, got {ast}"

From 6e3e32499a92594914ee320ff29c7fafbb065090 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Thu, 9 Feb 2023 11:30:36 +0100
Subject: [PATCH 3/8] Update FSharp.Compiler.UnitTests.fsproj

---
 .../FSharp.Compiler.UnitTests.fsproj          | 70 +------------------
 1 file changed, 1 insertion(+), 69 deletions(-)

diff --git a/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj b/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj
index f3176edc047..a1b239c1141 100644
--- a/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj
+++ b/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj
@@ -36,75 +36,7 @@
     <Compile Include="..\..\tests\service\Symbols.fs">
       <Link>CompilerService\Symbols.fs</Link>
     </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\TypeTests.fs">
-      <Link>SyntaxTree\TypeTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\ExpressionTests.fs">
-      <Link>SyntaxTree\ExpressionTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\StringTests.fs">
-      <Link>SyntaxTree\StringTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\ModuleOrNamespaceTests.fs">
-      <Link>SyntaxTree\ModuleOrNamespaceTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\ModuleOrNamespaceSigTests.fs">
-      <Link>SyntaxTree\ModuleOrNamespaceSigTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\SignatureTypeTests.fs">
-      <Link>SyntaxTree\SignatureTypeTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\MeasureTests.fs">
-      <Link>SyntaxTree\MeasureTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\MatchClauseTests.fs">
-      <Link>SyntaxTree\MatchClauseTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\SourceIdentifierTests.fs">
-      <Link>SyntaxTree\SourceIdentifierTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\NestedModuleTests.fs">
-      <Link>SyntaxTree\NestedModuleTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\BindingTests.fs">
-      <Link>SyntaxTree\BindingTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\ParsedHashDirectiveTests.fs">
-      <Link>SyntaxTree\ParsedHashDirectiveTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\LambdaTests.fs">
-      <Link>SyntaxTree\LambdaTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\IfThenElseTests.fs">
-      <Link>SyntaxTree\IfThenElseTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\UnionCaseTests.fs">
-      <Link>SyntaxTree\UnionCaseTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\EnumCaseTests.fs">
-      <Link>SyntaxTree\EnumCaseTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\PatternTests.fs">
-      <Link>SyntaxTree\PatternTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\ExceptionTests.fs">
-      <Link>SyntaxTree\ExceptionTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\MemberFlagTests.fs">
-      <Link>SyntaxTree\MemberFlagTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\ComputationExpressionTests.fs">
-      <Link>SyntaxTree\ComputationExpressionTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\ConditionalDirectiveTests.fs">
-      <Link>SyntaxTree\ConditionalDirectiveTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\CodeCommentTests.fs">
-      <Link>SyntaxTree\CodeCommentTests.fs</Link>
-    </Compile>
-    <Compile Include="..\..\tests\service\SyntaxTreeTests\OperatorNameTests.fs">
-      <Link>SyntaxTree\OperatorNameTests.fs</Link>
-    </Compile>
+    <Compile Include="..\..\tests\service\SyntaxTreeTests.fs" />
     <Compile Include="..\..\tests\service\EditorTests.fs">
       <Link>CompilerService\EditorTests.fs</Link>
     </Compile>

From 67432f90ca1992eef30506cf0bb22d1d571ec359 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Thu, 9 Feb 2023 11:34:41 +0100
Subject: [PATCH 4/8] Add a newline before and after the file content.

---
 .../data/SyntaxTree/AbstractKeyword.fs        |   3 +-
 .../data/SyntaxTree/AbstractKeyword.fs.bsl    |  24 +-
 .../data/SyntaxTree/AbstractMemberKeyword.fs  |   3 +-
 .../SyntaxTree/AbstractMemberKeyword.fs.bsl   |  26 +-
 .../SyntaxTree/ActivePatternAsFunction.fs     |   3 +-
 .../SyntaxTree/ActivePatternAsFunction.fs.bsl |  14 +-
 .../SyntaxTree/ActivePatternDefinition.fs     |   3 +-
 .../SyntaxTree/ActivePatternDefinition.fs.bsl |  52 +--
 .../ActivePatternIdentifierInPrivateMember.fs |   3 +-
 ...ivePatternIdentifierInPrivateMember.fs.bsl |  54 +--
 tests/service/data/SyntaxTree/AndKeyword.fs   |   3 +-
 .../service/data/SyntaxTree/AndKeyword.fs.bsl |  46 +-
 ...ttributesInOptionalNamedMemberParameter.fs |   3 +-
 ...butesInOptionalNamedMemberParameter.fs.bsl |  52 +--
 ...BlockCommentInSourceCode,SignatureFile.fsi |   3 +-
 ...kCommentInSourceCode,SignatureFile.fsi.bsl |  14 +-
 .../SyntaxTree/BlockCommentInSourceCode.fs    |   3 +-
 .../BlockCommentInSourceCode.fs.bsl           |  26 +-
 .../ColonBeforeReturnTypeIsPartOfTrivia.fs    |   3 +-
 ...ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl |  28 +-
 ...oreReturnTypeIsPartOfTriviaInProperties.fs |   3 +-
 ...eturnTypeIsPartOfTriviaInProperties.fs.bsl |  76 ++--
 .../CommentAfterSourceCode,SignatureFile.fsi  |   3 +-
 ...mmentAfterSourceCode,SignatureFile.fsi.bsl |  14 +-
 .../data/SyntaxTree/CommentAfterSourceCode.fs |   3 +-
 .../SyntaxTree/CommentAfterSourceCode.fs.bsl  |  10 +-
 .../data/SyntaxTree/CommentAtEndOfFile.fs     |   3 +-
 .../data/SyntaxTree/CommentAtEndOfFile.fs.bsl |   6 +-
 .../SyntaxTree/CommentBetweenElseAndIf.fs     |   3 +-
 .../SyntaxTree/CommentBetweenElseAndIf.fs.bsl |  28 +-
 .../CommentOnSingleLine,SignatureFile.fsi     |   3 +-
 .../CommentOnSingleLine,SignatureFile.fsi.bsl |   6 +-
 .../data/SyntaxTree/CommentOnSingleLine.fs    |   3 +-
 .../SyntaxTree/CommentOnSingleLine.fs.bsl     |  10 +-
 .../ComplexArgumentsLambdaHasArrowRange.fs    |   3 +-
 ...ComplexArgumentsLambdaHasArrowRange.fs.bsl | 152 +++----
 ...ConditionalDirectiveAroundInlineKeyword.fs |   3 +-
 ...itionalDirectiveAroundInlineKeyword.fs.bsl |  44 +-
 ...angeOfTheEqualsSignInSynExprRecordField.fs |   3 +-
 ...OfTheEqualsSignInSynExprRecordField.fs.bsl |  12 +-
 .../SyntaxTree/CustomOperatorDefinition.fs    |   3 +-
 .../CustomOperatorDefinition.fs.bsl           |  28 +-
 ...spaceRangeShouldStartAtNamespaceKeyword.fs |   3 +-
 ...eRangeShouldStartAtNamespaceKeyword.fs.bsl |  20 +-
 .../data/SyntaxTree/DeeplyNestedIfThenElse.fs |   3 +-
 .../SyntaxTree/DeeplyNestedIfThenElse.fs.bsl  |  38 +-
 .../data/SyntaxTree/DefaultKeyword.fsi        |   3 +-
 .../data/SyntaxTree/DefaultKeyword.fsi.bsl    |  26 +-
 .../data/SyntaxTree/DefaultValKeyword.fs      |   3 +-
 .../data/SyntaxTree/DefaultValKeyword.fs.bsl  |  28 +-
 .../DestructedLambdaHasArrowRange.fs          |   3 +-
 .../DestructedLambdaHasArrowRange.fs.bsl      |  62 +--
 ...etectDifferenceBetweenCompiledOperators.fs |   3 +-
 ...tDifferenceBetweenCompiledOperators.fs.bsl |  20 +-
 ...ntAreNotReportedAsTrivia,SignatureFile.fsi |   3 +-
 ...eNotReportedAsTrivia,SignatureFile.fsi.bsl |  18 +-
 ...nMultilineCommentAreNotReportedAsTrivia.fs |   3 +-
 ...tilineCommentAreNotReportedAsTrivia.fs.bsl |  20 +-
 ...ngAreNotReportedAsTrivia,SignatureFile.fsi |   3 +-
 ...eNotReportedAsTrivia,SignatureFile.fsi.bsl |   4 +-
 ...InMultilineStringAreNotReportedAsTrivia.fs |   3 +-
 ...ltilineStringAreNotReportedAsTrivia.fs.bsl |  18 +-
 tests/service/data/SyntaxTree/DoKeyword.fs    |   3 +-
 .../service/data/SyntaxTree/DoKeyword.fs.bsl  |  26 +-
 .../data/SyntaxTree/DoStaticKeyword.fs        |   3 +-
 .../data/SyntaxTree/DoStaticKeyword.fs.bsl    |  28 +-
 .../ElseKeywordInSimpleIfThenElse.fs          |   3 +-
 .../ElseKeywordInSimpleIfThenElse.fs.bsl      |  16 +-
 .../EqualsTokenIsPresentInSynValSigMember.fsi |   3 +-
 ...alsTokenIsPresentInSynValSigMember.fsi.bsl |  32 +-
 .../EqualsTokenIsPresentInSynValSigValue.fsi  |   3 +-
 ...ualsTokenIsPresentInSynValSigValue.fsi.bsl |  18 +-
 .../service/data/SyntaxTree/ExternKeyword.fs  |   3 +-
 .../data/SyntaxTree/ExternKeyword.fs.bsl      |  28 +-
 .../ExternKeywordIsPresentInTrivia.fs         |   3 +-
 .../ExternKeywordIsPresentInTrivia.fs.bsl     |  28 +-
 .../GetSetMemberWithInlineKeyword.fs          |   3 +-
 .../GetSetMemberWithInlineKeyword.fs.bsl      |  66 +--
 .../GlobalInOpenPathShouldContainTrivia.fs    |   3 +-
 ...GlobalInOpenPathShouldContainTrivia.fs.bsl |  10 +-
 .../data/SyntaxTree/GlobalKeywordAsSynExpr.fs |   3 +-
 .../SyntaxTree/GlobalKeywordAsSynExpr.fs.bsl  |   6 +-
 ...lNamespaceShouldStartAtNamespaceKeyword.fs |   3 +-
 ...espaceShouldStartAtNamespaceKeyword.fs.bsl |  24 +-
 ...NamespaceShouldStartAtNamespaceKeyword.fsi |   3 +-
 ...spaceShouldStartAtNamespaceKeyword.fsi.bsl |  38 +-
 .../If,ThenAndElseKeywordOnSeparateLines.fs   |   3 +-
 ...f,ThenAndElseKeywordOnSeparateLines.fs.bsl |  16 +-
 .../data/SyntaxTree/IfKeywordInIfThenElse.fs  |   3 +-
 .../SyntaxTree/IfKeywordInIfThenElse.fs.bsl   |  14 +-
 .../SyntaxTree/ImplicitCtorWithAsKeyword.fs   |   3 +-
 .../ImplicitCtorWithAsKeyword.fs.bsl          |  70 +--
 .../service/data/SyntaxTree/InHeadPattern.fs  |   3 +-
 .../data/SyntaxTree/InHeadPattern.fs.bsl      |  34 +-
 .../data/SyntaxTree/IncompleteLongIdent.fs    |   3 +-
 .../SyntaxTree/IncompleteLongIdent.fs.bsl     |  12 +-
 .../service/data/SyntaxTree/InfixOperation.fs |   3 +-
 .../data/SyntaxTree/InfixOperation.fs.bsl     |  14 +-
 ...angeOfTheEqualsSignInSynExprRecordField.fs |   3 +-
 ...OfTheEqualsSignInSynExprRecordField.fs.bsl |  28 +-
 .../service/data/SyntaxTree/InlineKeyword.fsi |   3 +-
 .../data/SyntaxTree/InlineKeyword.fsi.bsl     |  18 +-
 .../data/SyntaxTree/InlineKeywordInBinding.fs |   3 +-
 .../SyntaxTree/InlineKeywordInBinding.fs.bsl  |  42 +-
 ...leParameterWithWildCardGivesCorrectBody.fs |   3 +-
 ...rameterWithWildCardGivesCorrectBody.fs.bsl |  42 +-
 ...LambdaWithTwoParametersGivesCorrectBody.fs |   3 +-
 ...daWithTwoParametersGivesCorrectBody.fs.bsl |  24 +-
 ...daWithWildCardParameterGivesCorrectBody.fs |   3 +-
 ...thWildCardParameterGivesCorrectBody.fs.bsl |  34 +-
 ...dCardThatReturnsALambdaGivesCorrectBody.fs |   3 +-
 ...dThatReturnsALambdaGivesCorrectBody.fs.bsl |  34 +-
 .../LeadingKeywordInRecursiveTypes.fsi        |   3 +-
 .../LeadingKeywordInRecursiveTypes.fsi.bsl    |  32 +-
 tests/service/data/SyntaxTree/LetKeyword.fs   |   3 +-
 .../service/data/SyntaxTree/LetKeyword.fs.bsl |  24 +-
 .../service/data/SyntaxTree/LetRecKeyword.fs  |   3 +-
 .../data/SyntaxTree/LetRecKeyword.fs.bsl      |  26 +-
 .../MeasureContainsTheRangeOfTheConstant.fs   |   3 +-
 ...easureContainsTheRangeOfTheConstant.fs.bsl |  46 +-
 .../service/data/SyntaxTree/MemberKeyword.fs  |   3 +-
 .../data/SyntaxTree/MemberKeyword.fs.bsl      |  36 +-
 ...ShouldContainsTheRangeOfTheWithKeyword.fsi |   3 +-
 ...ldContainsTheRangeOfTheWithKeyword.fsi.bsl |  34 +-
 .../data/SyntaxTree/MemberValKeyword.fs       |   3 +-
 .../data/SyntaxTree/MemberValKeyword.fs.bsl   |  28 +-
 .../SyntaxTree/MemberWithInlineKeyword.fs     |   3 +-
 .../SyntaxTree/MemberWithInlineKeyword.fs.bsl |  38 +-
 .../ModuleRangeShouldStartAtFirstAttribute.fs |   3 +-
 ...uleRangeShouldStartAtFirstAttribute.fs.bsl |  36 +-
 ...ModuleRangeShouldStartAtFirstAttribute.fsi |   3 +-
 ...leRangeShouldStartAtFirstAttribute.fsi.bsl |  20 +-
 .../ModuleShouldContainModuleKeyword.fs       |   3 +-
 .../ModuleShouldContainModuleKeyword.fs.bsl   |  64 +--
 .../ModuleShouldContainModuleKeyword.fsi      |   3 +-
 .../ModuleShouldContainModuleKeyword.fsi.bsl  |  14 +-
 .../MultilineLambdaHasArrowRange.fs           |   3 +-
 .../MultilineLambdaHasArrowRange.fs.bsl       |  58 +--
 ...veARangeThatStartsAtTheNamespaceKeyword.fs |   3 +-
 ...angeThatStartsAtTheNamespaceKeyword.fs.bsl |  38 +-
 ...tipleSynEnumCaseContainsRangeOfConstant.fs |   3 +-
 ...eSynEnumCaseContainsRangeOfConstant.fs.bsl |  38 +-
 .../MultipleSynEnumCasesHaveBarRange.fs       |   3 +-
 .../MultipleSynEnumCasesHaveBarRange.fs.bsl   |  38 +-
 ...eThatStartsAtAnd!AndEndsAfterExpression.fs |   3 +-
 ...tStartsAtAnd!AndEndsAfterExpression.fs.bsl |  48 +-
 .../MultipleSynUnionCasesHaveBarRange.fs      |   3 +-
 .../MultipleSynUnionCasesHaveBarRange.fs.bsl  |  38 +-
 .../service/data/SyntaxTree/NamedParameter.fs |   3 +-
 .../data/SyntaxTree/NamedParameter.fs.bsl     |  20 +-
 .../NamedParametersInDelegateType.fs          |   3 +-
 .../NamedParametersInDelegateType.fs.bsl      |  56 +--
 .../service/data/SyntaxTree/NameofOperator.fs |   3 +-
 .../data/SyntaxTree/NameofOperator.fs.bsl     |  12 +-
 .../NamespaceShouldContainNamespaceKeyword.fs |   3 +-
 ...espaceShouldContainNamespaceKeyword.fs.bsl |  30 +-
 ...NamespaceShouldContainNamespaceKeyword.fsi |   3 +-
 ...spaceShouldContainNamespaceKeyword.fsi.bsl |  22 +-
 .../data/SyntaxTree/NestedElifInIfThenElse.fs |   3 +-
 .../SyntaxTree/NestedElifInIfThenElse.fs.bsl  |  24 +-
 .../SyntaxTree/NestedElseIfInIfThenElse.fs    |   3 +-
 .../NestedElseIfInIfThenElse.fs.bsl           |  26 +-
 .../NestedElseIfOnTheSameLineInIfThenElse.fs  |   3 +-
 ...stedElseIfOnTheSameLineInIfThenElse.fs.bsl |  26 +-
 .../NestedIfElseEndif,SignatureFile.fsi       |   3 +-
 .../NestedIfElseEndif,SignatureFile.fsi.bsl   |  28 +-
 .../data/SyntaxTree/NestedIfElseEndif.fs      |   3 +-
 .../data/SyntaxTree/NestedIfElseEndif.fs.bsl  |  30 +-
 ...ifWithComplexExpressions,SignatureFile.fsi |   3 +-
 ...thComplexExpressions,SignatureFile.fsi.bsl |  28 +-
 .../NestedIfEndifWithComplexExpressions.fs    |   3 +-
 ...NestedIfEndifWithComplexExpressions.fs.bsl |  30 +-
 ...ExprLetOrUseContainsTheRangeOfInKeyword.fs |   3 +-
 ...LetOrUseContainsTheRangeOfInKeyword.fs.bsl |  62 +--
 .../NestedSynTypeOrInsideSynExprTraitCall.fs  |   3 +-
 ...stedSynTypeOrInsideSynExprTraitCall.fs.bsl |  92 ++--
 ...NestedTypeHasStaticTypeAsLeadingKeyword.fs |   3 +-
 ...edTypeHasStaticTypeAsLeadingKeyword.fs.bsl |  32 +-
 ...estedTypeHasStaticTypeAsLeadingKeyword.fsi |   3 +-
 ...dTypeHasStaticTypeAsLeadingKeyword.fsi.bsl |  32 +-
 tests/service/data/SyntaxTree/NewKeyword.fs   |   3 +-
 .../service/data/SyntaxTree/NewKeyword.fs.bsl |  50 +-
 ...InASingleSynMatchClauseInSynExprTryWith.fs |   3 +-
 ...ingleSynMatchClauseInSynExprTryWith.fs.bsl |  32 +-
 .../SyntaxTree/ObjectModelWithTwoMembers.fs   |   3 +-
 .../ObjectModelWithTwoMembers.fs.bsl          |  86 ++--
 .../data/SyntaxTree/OperatorAsFunction.fs     |   3 +-
 .../data/SyntaxTree/OperatorAsFunction.fs.bsl |  18 +-
 .../data/SyntaxTree/OperatorInMatchPattern.fs |   3 +-
 .../SyntaxTree/OperatorInMatchPattern.fs.bsl  |  32 +-
 .../SyntaxTree/OperatorInMemberDefinition.fs  |   3 +-
 .../OperatorInMemberDefinition.fs.bsl         |  44 +-
 .../SyntaxTree/OperatorInSynPatLongIdent.fs   |   3 +-
 .../OperatorInSynPatLongIdent.fs.bsl          |  36 +-
 .../SyntaxTree/OperatorNameInSynValSig.fsi    |   3 +-
 .../OperatorNameInSynValSig.fsi.bsl           |  30 +-
 .../OperatorNameInValConstraint.fsi           |   3 +-
 .../OperatorNameInValConstraint.fsi.bsl       |  66 +--
 .../data/SyntaxTree/OptionalExpression.fs     |   3 +-
 .../data/SyntaxTree/OptionalExpression.fs.bsl |  22 +-
 .../data/SyntaxTree/OverrideKeyword.fs        |   3 +-
 .../data/SyntaxTree/OverrideKeyword.fs.bsl    |  38 +-
 .../data/SyntaxTree/OverrideValKeyword.fs     |   3 +-
 .../data/SyntaxTree/OverrideValKeyword.fs.bsl |  28 +-
 .../ParenthesesOfSynArgPatsNamePatPairs.fs    |   3 +-
 ...ParenthesesOfSynArgPatsNamePatPairs.fs.bsl |  46 +-
 .../PartialActivePatternAsFunction.fs         |   3 +-
 .../PartialActivePatternAsFunction.fs.bsl     |  14 +-
 .../PartialActivePatternDefinition.fs         |   3 +-
 .../PartialActivePatternDefinition.fs.bsl     |  52 +--
 ...ctivePatternDefinitionWithoutParameters.fs |   3 +-
 ...ePatternDefinitionWithoutParameters.fs.bsl |  24 +-
 .../data/SyntaxTree/PrefixOperation.fs        |   3 +-
 .../data/SyntaxTree/PrefixOperation.fs.bsl    |  10 +-
 .../PrefixOperationWithTwoCharacters.fs       |   3 +-
 .../PrefixOperationWithTwoCharacters.fs.bsl   |   8 +-
 .../data/SyntaxTree/PrivateKeywordHasRange.fs |   3 +-
 .../SyntaxTree/PrivateKeywordHasRange.fs.bsl  |  38 +-
 .../SyntaxTree/QualifiedOperatorExpression.fs |   3 +-
 .../QualifiedOperatorExpression.fs.bsl        |  32 +-
 ...rReturnsRangeOfSynModuleOrNamespaceSig.fsi |   3 +-
 ...urnsRangeOfSynModuleOrNamespaceSig.fsi.bsl |  34 +-
 .../RangeOfArrowInSynMatchClause.fs           |   3 +-
 .../RangeOfArrowInSynMatchClause.fs.bsl       |  24 +-
 ...geOfArrowInSynMatchClauseWithWhenClause.fs |   3 +-
 ...ArrowInSynMatchClauseWithWhenClause.fs.bsl |  32 +-
 .../data/SyntaxTree/RangeOfAttribute.fs       |   3 +-
 .../data/SyntaxTree/RangeOfAttribute.fs.bsl   |  30 +-
 ...tternShouldBeIncludedInSynModuleDeclLet.fs |   3 +-
 ...nShouldBeIncludedInSynModuleDeclLet.fs.bsl |  28 +-
 ...ouldBeIncludedInBindingOfSynExprObjExpr.fs |   3 +-
 ...BeIncludedInBindingOfSynExprObjExpr.fs.bsl |  42 +-
 ...onstructorSynMemberDefnMember,OptAsSpec.fs |   3 +-
 ...ructorSynMemberDefnMember,OptAsSpec.fs.bsl |  40 +-
 ...ncludedInConstructorSynMemberDefnMember.fs |   3 +-
 ...dedInConstructorSynMemberDefnMember.fs.bsl |  40 +-
 ...cludedInFullSynMemberDefnMemberProperty.fs |   3 +-
 ...edInFullSynMemberDefnMemberProperty.fs.bsl |  72 +--
 ...eShouldBeIncludedInSecondaryConstructor.fs |   3 +-
 ...uldBeIncludedInSecondaryConstructor.fs.bsl |  96 ++--
 ...SynExceptionDefnReprAndSynExceptionSig.fsi |   3 +-
 ...xceptionDefnReprAndSynExceptionSig.fsi.bsl |  38 +-
 ...uldBeIncludedInSynMemberDefnLetBindings.fs |   3 +-
 ...eIncludedInSynMemberDefnLetBindings.fs.bsl |  38 +-
 ...teShouldBeIncludedInSynMemberDefnMember.fs |   3 +-
 ...ouldBeIncludedInSynMemberDefnMember.fs.bsl |  42 +-
 ...ibuteShouldBeIncludedInSynModuleDeclLet.fs |   3 +-
 ...eShouldBeIncludedInSynModuleDeclLet.fs.bsl |  24 +-
 ...ldBeIncludedInSynModuleDeclNestedModule.fs |   3 +-
 ...IncludedInSynModuleDeclNestedModule.fs.bsl |  26 +-
 ...IncludedInSynModuleSigDeclNestedModule.fsi |   3 +-
 ...udedInSynModuleSigDeclNestedModule.fsi.bsl |  28 +-
 ...fAttributeShouldBeIncludedInSynTypeDefn.fs |   3 +-
 ...ributeShouldBeIncludedInSynTypeDefn.fs.bsl |  22 +-
 ...ributeShouldBeIncludedInSynTypeDefnSig.fsi |   3 +-
 ...teShouldBeIncludedInSynTypeDefnSig.fsi.bsl |  24 +-
 ...eShouldBeIncludedInSynValSpfnAndMember.fsi |   3 +-
 ...uldBeIncludedInSynValSpfnAndMember.fsi.bsl |  34 +-
 ...dInWriteOnlySynMemberDefnMemberProperty.fs |   3 +-
 ...riteOnlySynMemberDefnMemberProperty.fs.bsl |  46 +-
 .../SyntaxTree/RangeOfAttributeWithPath.fs    |   3 +-
 .../RangeOfAttributeWithPath.fs.bsl           |  32 +-
 .../SyntaxTree/RangeOfAttributeWithTarget.fs  |   3 +-
 .../RangeOfAttributeWithTarget.fs.bsl         |  30 +-
 ...ributesShouldBeIncludedInRecursiveTypes.fs |   3 +-
 ...tesShouldBeIncludedInRecursiveTypes.fs.bsl | 100 ++--
 ...ibutesShouldBeIncludedInRecursiveTypes.fsi |   3 +-
 ...esShouldBeIncludedInRecursiveTypes.fsi.bsl |  64 +--
 ...MultipleSynMatchClausesInSynExprTryWith.fs |   3 +-
 ...ipleSynMatchClausesInSynExprTryWith.fs.bsl |  48 +-
 ...arInASingleSynMatchClauseInSynExprMatch.fs |   3 +-
 ...ASingleSynMatchClauseInSynExprMatch.fs.bsl |  32 +-
 ...InASingleSynMatchClauseInSynExprTryWith.fs |   3 +-
 ...ingleSynMatchClauseInSynExprTryWith.fs.bsl |  32 +-
 ...InMultipleSynMatchClausesInSynExprMatch.fs |   3 +-
 ...ltipleSynMatchClausesInSynExprMatch.fs.bsl |  46 +-
 ...EqualSignShouldBePresent,SignatureFile.fsi |   3 +-
 ...lSignShouldBePresent,SignatureFile.fsi.bsl |  22 +-
 .../RangeOfEqualSignShouldBePresent.fs        |   3 +-
 .../RangeOfEqualSignShouldBePresent.fs.bsl    |  16 +-
 ...nShouldBePresentInLocalLetBinding,Typed.fs |   3 +-
 ...uldBePresentInLocalLetBinding,Typed.fs.bsl |  30 +-
 ...ualSignShouldBePresentInLocalLetBinding.fs |   3 +-
 ...ignShouldBePresentInLocalLetBinding.fs.bsl |  24 +-
 ...BePresentInMemberBinding,WithParameters.fs |   3 +-
 ...esentInMemberBinding,WithParameters.fs.bsl |  46 +-
 ...BePresentInMemberBinding,WithReturnType.fs |   3 +-
 ...esentInMemberBinding,WithReturnType.fs.bsl |  52 +--
 ...EqualSignShouldBePresentInMemberBinding.fs |   3 +-
 ...lSignShouldBePresentInMemberBinding.fs.bsl |  42 +-
 ...ngeOfEqualSignShouldBePresentInProperty.fs |   3 +-
 ...fEqualSignShouldBePresentInProperty.fs.bsl |  72 +--
 ...ePresentInSynModuleDeclLetBinding,Typed.fs |   3 +-
 ...sentInSynModuleDeclLetBinding,Typed.fs.bsl |  24 +-
 ...houldBePresentInSynModuleDeclLetBinding.fs |   3 +-
 ...dBePresentInSynModuleDeclLetBinding.fs.bsl |  18 +-
 ...ShouldBePresentInSynExprLetOrUseBinding.fs |   3 +-
 ...ldBePresentInSynExprLetOrUseBinding.fs.bsl |  30 +-
 ...houldBePresentInSynModuleDeclLetBinding.fs |   3 +-
 ...dBePresentInSynModuleDeclLetBinding.fs.bsl |  18 +-
 ...InSynModuleDeclLetBindingWithAttributes.fs |   3 +-
 ...nModuleDeclLetBindingWithAttributes.fs.bsl |  26 +-
 ...ceptionSigAndSynModuleSigDeclException.fsi |   3 +-
 ...ionSigAndSynModuleSigDeclException.fsi.bsl |  44 +-
 .../RangeOfMultipleSynMatchClause.fs          |   3 +-
 .../RangeOfMultipleSynMatchClause.fs.bsl      |  60 +--
 ...FileShouldEndAtTheLastSynModuleSigDecl.fsi |   3 +-
 ...ShouldEndAtTheLastSynModuleSigDecl.fsi.bsl | 428 +++++++++---------
 .../SyntaxTree/RangeOfSingleSynMatchClause.fs |   3 +-
 .../RangeOfSingleSynMatchClause.fs.bsl        |  50 +-
 ...angeOfSingleSynMatchClauseFollowedByBar.fs |   3 +-
 ...OfSingleSynMatchClauseFollowedByBar.fs.bsl |  46 +-
 ...geOfSingleSynMatchClauseWithMissingBody.fs |   3 +-
 ...SingleSynMatchClauseWithMissingBody.fs.bsl |  44 +-
 ...ynMatchClauseWithMissingBodyAndWhenExpr.fs |   3 +-
 ...tchClauseWithMissingBodyAndWhenExpr.fs.bsl |  52 +--
 ...peDefnSigDelegateOfShouldStartFromName.fsi |   3 +-
 ...fnSigDelegateOfShouldStartFromName.fsi.bsl |  30 +-
 ...efnSigObjectModelShouldEndAtLastMember.fsi |   3 +-
 ...igObjectModelShouldEndAtLastMember.fsi.bsl |  30 +-
 ...TypeDefnSigRecordShouldEndAtLastMember.fsi |   3 +-
 ...DefnSigRecordShouldEndAtLastMember.fsi.bsl |  36 +-
 ...SynTypeDefnSigSimpleShouldEndAtLastVal.fsi |   3 +-
 ...ypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl |  40 +-
 .../RangeOfTypeShouldEndAtEndKeyword.fsi      |   3 +-
 .../RangeOfTypeShouldEndAtEndKeyword.fsi.bsl  |  20 +-
 ...nMemberContainsTheRangeOfTheWithKeyword.fs |   3 +-
 ...berContainsTheRangeOfTheWithKeyword.fs.bsl |  52 +--
 ...nMemberContainsTheRangeOfTheWithKeyword.fs |   3 +-
 ...berContainsTheRangeOfTheWithKeyword.fs.bsl |  74 +--
 ...ularStringAsParsedHashDirectiveArgument.fs |   3 +-
 ...StringAsParsedHashDirectiveArgument.fs.bsl |   6 +-
 .../SyntaxTree/SignatureMemberWithGet.fsi     |   3 +-
 .../SyntaxTree/SignatureMemberWithGet.fsi.bsl |  34 +-
 .../SyntaxTree/SignatureMemberWithSet,get.fsi |   3 +-
 .../SignatureMemberWithSet,get.fsi.bsl        |  36 +-
 .../SyntaxTree/SignatureMemberWithSet.fsi     |   3 +-
 .../SyntaxTree/SignatureMemberWithSet.fsi.bsl |  34 +-
 .../SyntaxTree/SimpleLambdaHasArrowRange.fs   |   3 +-
 .../SimpleLambdaHasArrowRange.fs.bsl          |  14 +-
 .../SingleIfElseEndif,SignatureFile.fsi       |   3 +-
 .../SingleIfElseEndif,SignatureFile.fsi.bsl   |  22 +-
 .../data/SyntaxTree/SingleIfElseEndif.fs      |   3 +-
 .../data/SyntaxTree/SingleIfElseEndif.fs.bsl  |  24 +-
 .../SingleIfEndif,SignatureFile.fsi           |   3 +-
 .../SingleIfEndif,SignatureFile.fsi.bsl       |  20 +-
 .../service/data/SyntaxTree/SingleIfEndif.fs  |   3 +-
 .../data/SyntaxTree/SingleIfEndif.fs.bsl      |  22 +-
 ...ingleSynEnumCaseContainsRangeOfConstant.fs |   3 +-
 ...eSynEnumCaseContainsRangeOfConstant.fs.bsl |  26 +-
 .../SingleSynEnumCaseHasBarRange.fs           |   3 +-
 .../SingleSynEnumCaseHasBarRange.fs.bsl       |  28 +-
 .../SyntaxTree/SingleSynEnumCaseWithoutBar.fs |   3 +-
 .../SingleSynEnumCaseWithoutBar.fs.bsl        |  26 +-
 .../SingleSynTypeInsideSynExprTraitCall.fs    |   3 +-
 ...SingleSynTypeInsideSynExprTraitCall.fs.bsl | 122 ++---
 .../SingleSynUnionCaseHasBarRange.fs          |   3 +-
 .../SingleSynUnionCaseHasBarRange.fs.bsl      |  28 +-
 .../SingleSynUnionCaseWithoutBar.fs           |   3 +-
 .../SingleSynUnionCaseWithoutBar.fs.bsl       |  26 +-
 ...IdentifierAsParsedHashDirectiveArgument.fs |   3 +-
 ...tifierAsParsedHashDirectiveArgument.fs.bsl |   8 +-
 .../data/SyntaxTree/StaticAbstractKeyword.fs  |   3 +-
 .../SyntaxTree/StaticAbstractKeyword.fs.bsl   |  30 +-
 .../SyntaxTree/StaticAbstractMemberKeyword.fs |   3 +-
 .../StaticAbstractMemberKeyword.fs.bsl        |  32 +-
 .../data/SyntaxTree/StaticLetKeyword.fs       |   3 +-
 .../data/SyntaxTree/StaticLetKeyword.fs.bsl   |  34 +-
 .../data/SyntaxTree/StaticLetRecKeyword.fs    |   3 +-
 .../SyntaxTree/StaticLetRecKeyword.fs.bsl     |  40 +-
 .../data/SyntaxTree/StaticMemberKeyword.fs    |   3 +-
 .../SyntaxTree/StaticMemberKeyword.fs.bsl     |  38 +-
 .../data/SyntaxTree/StaticMemberValKeyword.fs |   3 +-
 .../SyntaxTree/StaticMemberValKeyword.fs.bsl  |  30 +-
 .../data/SyntaxTree/StaticValKeyword.fsi      |   3 +-
 .../data/SyntaxTree/StaticValKeyword.fsi.bsl  |  32 +-
 ...PatPairsContainsTheRangeOfTheEqualsSign.fs |   3 +-
 ...airsContainsTheRangeOfTheEqualsSign.fs.bsl |  28 +-
 ...nConstBytesWithSynByteStringKindRegular.fs |   3 +-
 ...stBytesWithSynByteStringKindRegular.fs.bsl |  20 +-
 ...ConstBytesWithSynByteStringKindVerbatim.fs |   3 +-
 ...tBytesWithSynByteStringKindVerbatim.fs.bsl |  20 +-
 .../SynConstStringWithSynStringKindRegular.fs |   3 +-
 ...ConstStringWithSynStringKindRegular.fs.bsl |  20 +-
 ...ConstStringWithSynStringKindTripleQuote.fs |   3 +-
 ...tStringWithSynStringKindTripleQuote.fs.bsl |  18 +-
 ...SynConstStringWithSynStringKindVerbatim.fs |   3 +-
 ...onstStringWithSynStringKindVerbatim.fs.bsl |  20 +-
 ...nShouldContainsTheRangeOfTheWithKeyword.fs |   3 +-
 ...uldContainsTheRangeOfTheWithKeyword.fs.bsl |  34 +-
 ...ShouldContainsTheRangeOfTheWithKeyword.fsi |   3 +-
 ...ldContainsTheRangeOfTheWithKeyword.fsi.bsl |  28 +-
 ...RangeStartsAtAnd!AndEndsAfterExpression.fs |   3 +-
 ...eStartsAtAnd!AndEndsAfterExpression.fs.bsl |  34 +-
 .../SynExprAnonRecdWithStructKeyword.fs       |   3 +-
 .../SynExprAnonRecdWithStructKeyword.fs.bsl   |  14 +-
 ...tainsTheRangeOfTheEqualsSignInTheFields.fs |   3 +-
 ...sTheRangeOfTheEqualsSignInTheFields.fs.bsl |  18 +-
 ...SynExprDoContainsTheRangeOfTheDoKeyword.fs |   3 +-
 ...xprDoContainsTheRangeOfTheDoKeyword.fs.bsl |  20 +-
 .../SynExprDynamicDoesContainIdent.fs         |   3 +-
 .../SynExprDynamicDoesContainIdent.fs.bsl     |   8 +-
 .../SynExprDynamicDoesContainParentheses.fs   |   3 +-
 ...ynExprDynamicDoesContainParentheses.fs.bsl |  14 +-
 ...nExprForContainsTheRangeOfTheEqualsSign.fs |   3 +-
 ...rForContainsTheRangeOfTheEqualsSign.fs.bsl |  24 +-
 ...erpolatedStringWithSynStringKindRegular.fs |   3 +-
 ...latedStringWithSynStringKindRegular.fs.bsl |  24 +-
 ...latedStringWithSynStringKindTripleQuote.fs |   3 +-
 ...dStringWithSynStringKindTripleQuote.fs.bsl |  18 +-
 ...rpolatedStringWithSynStringKindVerbatim.fs |   3 +-
 ...atedStringWithSynStringKindVerbatim.fs.bsl |  24 +-
 ...rUseBangContainsTheRangeOfTheEqualsSign.fs |   3 +-
 ...BangContainsTheRangeOfTheEqualsSign.fs.bsl |  32 +-
 ...ExprLetOrUseContainsTheRangeOfInKeyword.fs |   3 +-
 ...LetOrUseContainsTheRangeOfInKeyword.fs.bsl |  24 +-
 ...tOrUseDoesNotContainTheRangeOfInKeyword.fs |   3 +-
 ...seDoesNotContainTheRangeOfInKeyword.fs.bsl |  24 +-
 ...actersDoesNotContainTheRangeOfInKeyword.fs |   3 +-
 ...rsDoesNotContainTheRangeOfInKeyword.fs.bsl |  36 +-
 ...rsiveBindingContainsTheRangeOfInKeyword.fs |   3 +-
 ...eBindingContainsTheRangeOfInKeyword.fs.bsl |  42 +-
 ...ontainsTheRangeOfTheMatchAndWithKeyword.fs |   3 +-
 ...insTheRangeOfTheMatchAndWithKeyword.fs.bsl |  20 +-
 ...ontainsTheRangeOfTheMatchAndWithKeyword.fs |   3 +-
 ...insTheRangeOfTheMatchAndWithKeyword.fs.bsl |  20 +-
 ...xprObjExprContainsTheRangeOfWithKeyword.fs |   3 +-
 ...bjExprContainsTheRangeOfWithKeyword.fs.bsl |  76 ++--
 .../SynExprObjMembersHaveCorrectKeywords.fs   |   3 +-
 ...ynExprObjMembersHaveCorrectKeywords.fs.bsl |  86 ++--
 .../data/SyntaxTree/SynExprObjWithSetter.fs   |   3 +-
 .../SyntaxTree/SynExprObjWithSetter.fs.bsl    |  82 ++--
 ...angeOfTheEqualsSignInSynExprRecordField.fs |   3 +-
 ...OfTheEqualsSignInSynExprRecordField.fs.bsl |  20 +-
 ...ecordFieldsContainCorrectAmountOfTrivia.fs |   3 +-
 ...dFieldsContainCorrectAmountOfTrivia.fs.bsl |  36 +-
 .../SynExprSetWithSynExprDynamic.fs           |   3 +-
 .../SynExprSetWithSynExprDynamic.fs.bsl       |  12 +-
 ...yContainsTheRangeOfTheTryAndWithKeyword.fs |   3 +-
 ...tainsTheRangeOfTheTryAndWithKeyword.fs.bsl |  16 +-
 ...hContainsTheRangeOfTheTryAndWithKeyword.fs |   3 +-
 ...tainsTheRangeOfTheTryAndWithKeyword.fs.bsl |  26 +-
 .../SynMeasureParenHasCorrectRange.fs         |   3 +-
 .../SynMeasureParenHasCorrectRange.fs.bsl     |  24 +-
 ...MemberDefnAbstractSlotHasCorrectKeyword.fs |   3 +-
 ...erDefnAbstractSlotHasCorrectKeyword.fs.bsl |  34 +-
 ...MemberDefnAutoPropertyHasCorrectKeyword.fs |   3 +-
 ...erDefnAutoPropertyHasCorrectKeyword.fs.bsl |  66 +--
 ...terfaceContainsTheRangeOfTheWithKeyword.fs |   3 +-
 ...aceContainsTheRangeOfTheWithKeyword.fs.bsl |  52 +--
 ...erDefnMemberSynValDataHasCorrectKeyword.fs |   3 +-
 ...fnMemberSynValDataHasCorrectKeyword.fs.bsl |  98 ++--
 .../SynMemberSigMemberHasCorrectKeywords.fsi  |   3 +-
 ...nMemberSigMemberHasCorrectKeywords.fsi.bsl |  71 +--
 .../SynPatOrContainsTheRangeOfTheBar.fs       |   3 +-
 .../SynPatOrContainsTheRangeOfTheBar.fs.bsl   |  38 +-
 ...atRecordContainsTheRangeOfTheEqualsSign.fs |   3 +-
 ...cordContainsTheRangeOfTheEqualsSign.fs.bsl |  36 +-
 ...ShouldContainsTheRangeOfTheWithKeyword.fsi |   3 +-
 ...ldContainsTheRangeOfTheWithKeyword.fsi.bsl |  32 +-
 ...ithEnumContainsTheRangeOfTheEqualsSign.fsi |   3 +-
 ...numContainsTheRangeOfTheEqualsSign.fsi.bsl |  40 +-
 ...elClassContainsTheRangeOfTheEqualsSign.fsi |   3 +-
 ...assContainsTheRangeOfTheEqualsSign.fsi.bsl |  18 +-
 ...elegateContainsTheRangeOfTheEqualsSign.fsi |   3 +-
 ...ateContainsTheRangeOfTheEqualsSign.fsi.bsl |  30 +-
 ...thUnionContainsTheRangeOfTheEqualsSign.fsi |   3 +-
 ...ionContainsTheRangeOfTheEqualsSign.fsi.bsl |  44 +-
 ...actSlotContainsTheRangeOfTheWithKeyword.fs |   3 +-
 ...lotContainsTheRangeOfTheWithKeyword.fs.bsl |  44 +-
 ...tributeContainsTheRangeOfTheTypeKeyword.fs |   3 +-
 ...uteContainsTheRangeOfTheTypeKeyword.fs.bsl |  26 +-
 ...ntationContainsTheRangeOfTheWithKeyword.fs |   3 +-
 ...ionContainsTheRangeOfTheWithKeyword.fs.bsl |  32 +-
 ...PropertyContainsTheRangeOfTheEqualsSign.fs |   3 +-
 ...ertyContainsTheRangeOfTheEqualsSign.fs.bsl |  60 +--
 ...ropertyContainsTheRangeOfTheWithKeyword.fs |   3 +-
 ...rtyContainsTheRangeOfTheWithKeyword.fs.bsl |  54 +--
 ...WithEnumContainsTheRangeOfTheEqualsSign.fs |   3 +-
 ...EnumContainsTheRangeOfTheEqualsSign.fs.bsl |  38 +-
 ...nTypeDefnWithMemberWithGetHasXmlComment.fs |   3 +-
 ...eDefnWithMemberWithGetHasXmlComment.fs.bsl |  40 +-
 .../SynTypeDefnWithMemberWithSetget.fs        |   3 +-
 .../SynTypeDefnWithMemberWithSetget.fs.bsl    |  88 ++--
 ...delClassContainsTheRangeOfTheEqualsSign.fs |   3 +-
 ...lassContainsTheRangeOfTheEqualsSign.fs.bsl |  28 +-
 ...DelegateContainsTheRangeOfTheEqualsSign.fs |   3 +-
 ...gateContainsTheRangeOfTheEqualsSign.fs.bsl |  28 +-
 ...hRecordContainsTheRangeOfTheWithKeyword.fs |   3 +-
 ...ordContainsTheRangeOfTheWithKeyword.fs.bsl |  54 +--
 .../SynTypeDefnWithStaticMemberWithGetset.fs  |   3 +-
 ...nTypeDefnWithStaticMemberWithGetset.fs.bsl |  94 ++--
 ...ithUnionContainsTheRangeOfTheEqualsSign.fs |   3 +-
 ...nionContainsTheRangeOfTheEqualsSign.fs.bsl |  42 +-
 ...hXmlDocContainsTheRangeOfTheTypeKeyword.fs |   3 +-
 ...DocContainsTheRangeOfTheTypeKeyword.fs.bsl |  34 +-
 .../SyntaxTree/SynTypeFunHasRangeOfArrow.fs   |   3 +-
 .../SynTypeFunHasRangeOfArrow.fs.bsl          |  24 +-
 .../SynTypeOrInsideSynExprTraitCall.fs        |   3 +-
 .../SynTypeOrInsideSynExprTraitCall.fs.bsl    |  74 +--
 ...nTypeConstraintWhereTyparSupportsMember.fs |   3 +-
 ...eConstraintWhereTyparSupportsMember.fs.bsl |  56 +--
 .../SynTypeOrWithAppTypeOnTheRightHandSide.fs |   3 +-
 ...TypeOrWithAppTypeOnTheRightHandSide.fs.bsl |  52 +--
 ...eDoesIncludeLeadingParameterAttributes.fsi |   3 +-
 ...sIncludeLeadingParameterAttributes.fsi.bsl |  60 +--
 ...peTupleDoesIncludeLeadingParameterName.fsi |   3 +-
 ...pleDoesIncludeLeadingParameterName.fsi.bsl |  36 +-
 ...nTypeTupleInMeasureTypeWithLeadingSlash.fs |   3 +-
 ...eTupleInMeasureTypeWithLeadingSlash.fs.bsl |  28 +-
 .../SynTypeTupleInMeasureTypeWithNoSlashes.fs |   3 +-
 ...TypeTupleInMeasureTypeWithNoSlashes.fs.bsl |  28 +-
 ...TypeTupleInMeasureTypeWithStartAndSlash.fs |   3 +-
 ...TupleInMeasureTypeWithStartAndSlash.fs.bsl |  30 +-
 .../SynTypeTupleWithStruct,Recovery.fs        |   3 +-
 .../SynTypeTupleWithStruct,Recovery.fs.bsl    |  32 +-
 .../data/SyntaxTree/SynTypeTupleWithStruct.fs |   3 +-
 .../SyntaxTree/SynTypeTupleWithStruct.fs.bsl  |  32 +-
 .../SyntaxTree/SynUnionCaseKindFullType.fs    |   3 +-
 .../SynUnionCaseKindFullType.fs.bsl           |  30 +-
 .../SynValSigContainsParameterNames.fsi       |   3 +-
 .../SynValSigContainsParameterNames.fsi.bsl   |  44 +-
 .../data/SyntaxTree/SyntheticKeyword.fs       |   3 +-
 .../data/SyntaxTree/SyntheticKeyword.fs.bsl   |  20 +-
 ...uoteStringAsParsedHashDirectiveArgument.fs |   3 +-
 ...StringAsParsedHashDirectiveArgument.fs.bsl |   6 +-
 ...uldBeCaptured,IfUsedInAnInvalidLocation.fs |   3 +-
 ...eCaptured,IfUsedInAnInvalidLocation.fs.bsl |  38 +-
 .../TripleSlashCommentShouldNotBeCaptured.fs  |   3 +-
 ...ipleSlashCommentShouldNotBeCaptured.fs.bsl |  18 +-
 .../TriviaIsPresentInSynTypeDefnSig.fsi       |   3 +-
 .../TriviaIsPresentInSynTypeDefnSig.fsi.bsl   |  84 ++--
 .../SyntaxTree/TupleInLambdaHasArrowRange.fs  |   3 +-
 .../TupleInLambdaHasArrowRange.fs.bsl         |  38 +-
 ...leReturnTypeOfBindingShouldContainStars.fs |   3 +-
 ...turnTypeOfBindingShouldContainStars.fs.bsl |  82 ++--
 .../UnionCaseFieldsCanHaveComments.fs         |   3 +-
 .../UnionCaseFieldsCanHaveComments.fs.bsl     |  32 +-
 tests/service/data/SyntaxTree/UseKeyword.fs   |   3 +-
 .../service/data/SyntaxTree/UseKeyword.fs.bsl |  24 +-
 .../service/data/SyntaxTree/UseRecKeyword.fs  |   3 +-
 .../data/SyntaxTree/UseRecKeyword.fs.bsl      |  28 +-
 tests/service/data/SyntaxTree/ValKeyword.fsi  |   3 +-
 .../data/SyntaxTree/ValKeyword.fsi.bsl        |  26 +-
 .../ValKeywordIsPresentInSynValSig.fsi        |   3 +-
 .../ValKeywordIsPresentInSynValSig.fsi.bsl    |  22 +-
 ...atimStringAsParsedHashDirectiveArgument.fs |   3 +-
 ...StringAsParsedHashDirectiveArgument.fs.bsl |   6 +-
 ...nMemberContainsTheRangeOfTheWithKeyword.fs |   3 +-
 ...berContainsTheRangeOfTheWithKeyword.fs.bsl |  54 +--
 tests/service/data/SyntaxTree/_LINE_.fs       |   3 +-
 tests/service/data/SyntaxTree/_LINE_.fs.bsl   |   6 +-
 .../data/SyntaxTree/_SOURCEDIRECTORY_.fs      |   3 +-
 .../data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl  |   8 +-
 tests/service/data/SyntaxTree/_SOURCEFILE_.fs |   3 +-
 .../data/SyntaxTree/_SOURCEFILE_.fs.bsl       |   8 +-
 556 files changed, 5597 insertions(+), 5318 deletions(-)

diff --git a/tests/service/data/SyntaxTree/AbstractKeyword.fs b/tests/service/data/SyntaxTree/AbstractKeyword.fs
index 6135c0cca9b..215f14af97c 100644
--- a/tests/service/data/SyntaxTree/AbstractKeyword.fs
+++ b/tests/service/data/SyntaxTree/AbstractKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    abstract Y : int
\ No newline at end of file
+    abstract Y : int
diff --git a/tests/service/data/SyntaxTree/AbstractKeyword.fs.bsl b/tests/service/data/SyntaxTree/AbstractKeyword.fs.bsl
index 64e6c644c6f..7d45c4f1bd8 100644
--- a/tests/service/data/SyntaxTree/AbstractKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/AbstractKeyword.fs.bsl
@@ -8,8 +8,8 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/AbstractKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/AbstractKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AbstractSlot
@@ -19,10 +19,10 @@ ImplFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            None, None, /root/AbstractKeyword.fs (2,4--2,20),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None, /root/AbstractKeyword.fs (3,4--3,20),
                             { LeadingKeyword =
-                               Abstract /root/AbstractKeyword.fs (2,4--2,12)
+                               Abstract /root/AbstractKeyword.fs (3,4--3,12)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -32,14 +32,14 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/AbstractKeyword.fs (2,4--2,20),
+                         /root/AbstractKeyword.fs (3,4--3,20),
                          { GetSetKeywords = None })],
-                     /root/AbstractKeyword.fs (2,4--2,20)), [], None,
-                  /root/AbstractKeyword.fs (1,5--2,20),
-                  { LeadingKeyword = Type /root/AbstractKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/AbstractKeyword.fs (1,7--1,8)
-                    WithKeyword = None })], /root/AbstractKeyword.fs (1,0--2,20))],
-          PreXmlDocEmpty, [], None, /root/AbstractKeyword.fs (1,0--2,20),
+                     /root/AbstractKeyword.fs (3,4--3,20)), [], None,
+                  /root/AbstractKeyword.fs (2,5--3,20),
+                  { LeadingKeyword = Type /root/AbstractKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/AbstractKeyword.fs (2,7--2,8)
+                    WithKeyword = None })], /root/AbstractKeyword.fs (2,0--3,20))],
+          PreXmlDocEmpty, [], None, /root/AbstractKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs b/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs
index 2528e96f13b..6d1c926a3ff 100644
--- a/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs
+++ b/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    abstract member Y : int
\ No newline at end of file
+    abstract member Y : int
diff --git a/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs.bsl
index 3e40c51337c..5f5178c1b72 100644
--- a/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs.bsl
@@ -8,8 +8,8 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/AbstractMemberKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/AbstractMemberKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AbstractSlot
@@ -19,13 +19,13 @@ ImplFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/AbstractMemberKeyword.fs (2,4--2,27),
+                            /root/AbstractMemberKeyword.fs (3,4--3,27),
                             { LeadingKeyword =
                                AbstractMember
-                                 (/root/AbstractMemberKeyword.fs (2,4--2,12),
-                                  /root/AbstractMemberKeyword.fs (2,13--2,19))
+                                 (/root/AbstractMemberKeyword.fs (3,4--3,12),
+                                  /root/AbstractMemberKeyword.fs (3,13--3,19))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -35,16 +35,16 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/AbstractMemberKeyword.fs (2,4--2,27),
+                         /root/AbstractMemberKeyword.fs (3,4--3,27),
                          { GetSetKeywords = None })],
-                     /root/AbstractMemberKeyword.fs (2,4--2,27)), [], None,
-                  /root/AbstractMemberKeyword.fs (1,5--2,27),
+                     /root/AbstractMemberKeyword.fs (3,4--3,27)), [], None,
+                  /root/AbstractMemberKeyword.fs (2,5--3,27),
                   { LeadingKeyword =
-                     Type /root/AbstractMemberKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/AbstractMemberKeyword.fs (1,7--1,8)
+                     Type /root/AbstractMemberKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/AbstractMemberKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/AbstractMemberKeyword.fs (1,0--2,27))], PreXmlDocEmpty, [],
-          None, /root/AbstractMemberKeyword.fs (1,0--2,27),
+              /root/AbstractMemberKeyword.fs (2,0--3,27))], PreXmlDocEmpty, [],
+          None, /root/AbstractMemberKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs b/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs
index 3e220f24f32..937819c0378 100644
--- a/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs
+++ b/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs
@@ -1 +1,2 @@
-(|Odd|Even|) 4
\ No newline at end of file
+
+(|Odd|Even|) 4
diff --git a/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs.bsl
index 2bd45e53344..2aa7260d94f 100644
--- a/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs.bsl
+++ b/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs.bsl
@@ -13,13 +13,13 @@ ImplFile
                       ([|Odd|Even|], [],
                        [Some
                           (HasParenthesis
-                             (/root/ActivePatternAsFunction.fs (1,0--1,1),
-                              /root/ActivePatternAsFunction.fs (1,11--1,12)))]),
-                    None, /root/ActivePatternAsFunction.fs (1,0--1,12)),
-                 Const (Int32 4, /root/ActivePatternAsFunction.fs (1,13--1,14)),
-                 /root/ActivePatternAsFunction.fs (1,0--1,14)),
-              /root/ActivePatternAsFunction.fs (1,0--1,14))], PreXmlDocEmpty, [],
-          None, /root/ActivePatternAsFunction.fs (1,0--1,14),
+                             (/root/ActivePatternAsFunction.fs (2,0--2,1),
+                              /root/ActivePatternAsFunction.fs (2,11--2,12)))]),
+                    None, /root/ActivePatternAsFunction.fs (2,0--2,12)),
+                 Const (Int32 4, /root/ActivePatternAsFunction.fs (2,13--2,14)),
+                 /root/ActivePatternAsFunction.fs (2,0--2,14)),
+              /root/ActivePatternAsFunction.fs (2,0--2,14))], PreXmlDocEmpty, [],
+          None, /root/ActivePatternAsFunction.fs (2,0--2,14),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ActivePatternDefinition.fs b/tests/service/data/SyntaxTree/ActivePatternDefinition.fs
index 9f148ee7984..e8faaf7d317 100644
--- a/tests/service/data/SyntaxTree/ActivePatternDefinition.fs
+++ b/tests/service/data/SyntaxTree/ActivePatternDefinition.fs
@@ -1 +1,2 @@
-let (|Odd|Even|) (a: int) = if a % 2 = 0 then Even else Odd
\ No newline at end of file
+
+let (|Odd|Even|) (a: int) = if a % 2 = 0 then Even else Odd
diff --git a/tests/service/data/SyntaxTree/ActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/ActivePatternDefinition.fs.bsl
index 4aff71b0616..7b2a2acdb93 100644
--- a/tests/service/data/SyntaxTree/ActivePatternDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/ActivePatternDefinition.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -19,19 +19,19 @@ ImplFile
                        ([|Odd|Even|], [],
                         [Some
                            (HasParenthesis
-                              (/root/ActivePatternDefinition.fs (1,4--1,5),
-                               /root/ActivePatternDefinition.fs (1,15--1,16)))]),
+                              (/root/ActivePatternDefinition.fs (2,4--2,5),
+                               /root/ActivePatternDefinition.fs (2,15--2,16)))]),
                      None, None,
                      Pats
                        [Paren
                           (Typed
                              (Named
                                 (SynIdent (a, None), false, None,
-                                 /root/ActivePatternDefinition.fs (1,18--1,19)),
+                                 /root/ActivePatternDefinition.fs (2,18--2,19)),
                               LongIdent (SynLongIdent ([int], [], [None])),
-                              /root/ActivePatternDefinition.fs (1,18--1,24)),
-                           /root/ActivePatternDefinition.fs (1,17--1,25))], None,
-                     /root/ActivePatternDefinition.fs (1,4--1,25)), None,
+                              /root/ActivePatternDefinition.fs (2,18--2,24)),
+                           /root/ActivePatternDefinition.fs (2,17--2,25))], None,
+                     /root/ActivePatternDefinition.fs (2,4--2,25)), None,
                   IfThenElse
                     (App
                        (NonAtomic, false,
@@ -42,7 +42,7 @@ ImplFile
                               SynLongIdent
                                 ([op_Equality], [],
                                  [Some (OriginalNotation "=")]), None,
-                              /root/ActivePatternDefinition.fs (1,37--1,38)),
+                              /root/ActivePatternDefinition.fs (2,37--2,38)),
                            App
                              (NonAtomic, false,
                               App
@@ -52,37 +52,37 @@ ImplFile
                                     SynLongIdent
                                       ([op_Modulus], [],
                                        [Some (OriginalNotation "%")]), None,
-                                    /root/ActivePatternDefinition.fs (1,33--1,34)),
+                                    /root/ActivePatternDefinition.fs (2,33--2,34)),
                                  Ident a,
-                                 /root/ActivePatternDefinition.fs (1,31--1,34)),
+                                 /root/ActivePatternDefinition.fs (2,31--2,34)),
                               Const
                                 (Int32 2,
-                                 /root/ActivePatternDefinition.fs (1,35--1,36)),
-                              /root/ActivePatternDefinition.fs (1,31--1,36)),
-                           /root/ActivePatternDefinition.fs (1,31--1,38)),
+                                 /root/ActivePatternDefinition.fs (2,35--2,36)),
+                              /root/ActivePatternDefinition.fs (2,31--2,36)),
+                           /root/ActivePatternDefinition.fs (2,31--2,38)),
                         Const
                           (Int32 0,
-                           /root/ActivePatternDefinition.fs (1,39--1,40)),
-                        /root/ActivePatternDefinition.fs (1,31--1,40)),
+                           /root/ActivePatternDefinition.fs (2,39--2,40)),
+                        /root/ActivePatternDefinition.fs (2,31--2,40)),
                      Ident Even, Some (Ident Odd),
-                     Yes /root/ActivePatternDefinition.fs (1,28--1,45), false,
-                     /root/ActivePatternDefinition.fs (1,28--1,59),
-                     { IfKeyword = /root/ActivePatternDefinition.fs (1,28--1,30)
+                     Yes /root/ActivePatternDefinition.fs (2,28--2,45), false,
+                     /root/ActivePatternDefinition.fs (2,28--2,59),
+                     { IfKeyword = /root/ActivePatternDefinition.fs (2,28--2,30)
                        IsElif = false
                        ThenKeyword =
-                        /root/ActivePatternDefinition.fs (1,41--1,45)
+                        /root/ActivePatternDefinition.fs (2,41--2,45)
                        ElseKeyword =
-                        Some /root/ActivePatternDefinition.fs (1,51--1,55)
+                        Some /root/ActivePatternDefinition.fs (2,51--2,55)
                        IfToThenRange =
-                        /root/ActivePatternDefinition.fs (1,28--1,45) }),
-                  /root/ActivePatternDefinition.fs (1,4--1,25), NoneAtLet,
+                        /root/ActivePatternDefinition.fs (2,28--2,45) }),
+                  /root/ActivePatternDefinition.fs (2,4--2,25), NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/ActivePatternDefinition.fs (1,0--1,3)
+                     Let /root/ActivePatternDefinition.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
-                     Some /root/ActivePatternDefinition.fs (1,26--1,27) })],
-              /root/ActivePatternDefinition.fs (1,0--1,59))], PreXmlDocEmpty, [],
-          None, /root/ActivePatternDefinition.fs (1,0--1,59),
+                     Some /root/ActivePatternDefinition.fs (2,26--2,27) })],
+              /root/ActivePatternDefinition.fs (2,0--2,59))], PreXmlDocEmpty, [],
+          None, /root/ActivePatternDefinition.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs b/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs
index 33c0852dc2e..9cea3505af2 100644
--- a/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs
+++ b/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs
@@ -1,6 +1,7 @@
+
 type A() =
     member private _.(|
         A'
     |) = (|
         Lazy
-    |)
\ No newline at end of file
+    |)
diff --git a/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs.bsl b/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs.bsl
index 63061cd5dc3..69c805e4d15 100644
--- a/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs.bsl
@@ -8,24 +8,24 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [A],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/ActivePatternIdentifierInPrivateMember.fs (1,5--1,6)),
+                     /root/ActivePatternIdentifierInPrivateMember.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/ActivePatternIdentifierInPrivateMember.fs (1,6--1,8)),
+                            /root/ActivePatternIdentifierInPrivateMember.fs (2,6--2,8)),
                          None,
-                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/ActivePatternIdentifierInPrivateMember.fs (1,5--1,6),
+                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/ActivePatternIdentifierInPrivateMember.fs (2,5--2,6),
                          { AsKeyword = None });
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -39,17 +39,17 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([_; |A'|],
-                                  [/root/ActivePatternIdentifierInPrivateMember.fs (2,20--2,21)],
+                                  [/root/ActivePatternIdentifierInPrivateMember.fs (3,20--3,21)],
                                   [None;
                                    Some
                                      (HasParenthesis
-                                        (/root/ActivePatternIdentifierInPrivateMember.fs (2,21--2,22),
-                                         /root/ActivePatternIdentifierInPrivateMember.fs (4,5--4,6)))]),
+                                        (/root/ActivePatternIdentifierInPrivateMember.fs (3,21--3,22),
+                                         /root/ActivePatternIdentifierInPrivateMember.fs (5,5--5,6)))]),
                                None, None, Pats [],
                                Some
                                  (Private
-                                    /root/ActivePatternIdentifierInPrivateMember.fs (2,11--2,18)),
-                               /root/ActivePatternIdentifierInPrivateMember.fs (2,11--4,6)),
+                                    /root/ActivePatternIdentifierInPrivateMember.fs (3,11--3,18)),
+                               /root/ActivePatternIdentifierInPrivateMember.fs (3,11--5,6)),
                             None,
                             LongIdent
                               (false,
@@ -57,43 +57,43 @@ ImplFile
                                  ([|Lazy|], [],
                                   [Some
                                      (HasParenthesis
-                                        (/root/ActivePatternIdentifierInPrivateMember.fs (4,9--4,10),
-                                         /root/ActivePatternIdentifierInPrivateMember.fs (6,5--6,6)))]),
+                                        (/root/ActivePatternIdentifierInPrivateMember.fs (5,9--5,10),
+                                         /root/ActivePatternIdentifierInPrivateMember.fs (7,5--7,6)))]),
                                None,
-                               /root/ActivePatternIdentifierInPrivateMember.fs (4,9--6,6)),
-                            /root/ActivePatternIdentifierInPrivateMember.fs (2,11--4,6),
+                               /root/ActivePatternIdentifierInPrivateMember.fs (5,9--7,6)),
+                            /root/ActivePatternIdentifierInPrivateMember.fs (3,11--5,6),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/ActivePatternIdentifierInPrivateMember.fs (2,4--2,10)
+                                 /root/ActivePatternIdentifierInPrivateMember.fs (3,4--3,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/ActivePatternIdentifierInPrivateMember.fs (4,7--4,8) }),
-                         /root/ActivePatternIdentifierInPrivateMember.fs (2,4--6,6))],
-                     /root/ActivePatternIdentifierInPrivateMember.fs (2,4--6,6)),
+                                 /root/ActivePatternIdentifierInPrivateMember.fs (5,7--5,8) }),
+                         /root/ActivePatternIdentifierInPrivateMember.fs (3,4--7,6))],
+                     /root/ActivePatternIdentifierInPrivateMember.fs (3,4--7,6)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/ActivePatternIdentifierInPrivateMember.fs (1,6--1,8)),
+                           /root/ActivePatternIdentifierInPrivateMember.fs (2,6--2,8)),
                         None,
-                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/ActivePatternIdentifierInPrivateMember.fs (1,5--1,6),
+                        PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/ActivePatternIdentifierInPrivateMember.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/ActivePatternIdentifierInPrivateMember.fs (1,5--6,6),
+                  /root/ActivePatternIdentifierInPrivateMember.fs (2,5--7,6),
                   { LeadingKeyword =
                      Type
-                       /root/ActivePatternIdentifierInPrivateMember.fs (1,0--1,4)
+                       /root/ActivePatternIdentifierInPrivateMember.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/ActivePatternIdentifierInPrivateMember.fs (1,9--1,10)
+                       /root/ActivePatternIdentifierInPrivateMember.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/ActivePatternIdentifierInPrivateMember.fs (1,0--6,6))],
+              /root/ActivePatternIdentifierInPrivateMember.fs (2,0--7,6))],
           PreXmlDocEmpty, [], None,
-          /root/ActivePatternIdentifierInPrivateMember.fs (1,0--6,6),
+          /root/ActivePatternIdentifierInPrivateMember.fs (2,0--8,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AndKeyword.fs b/tests/service/data/SyntaxTree/AndKeyword.fs
index b7659775be8..146ef6918d9 100644
--- a/tests/service/data/SyntaxTree/AndKeyword.fs
+++ b/tests/service/data/SyntaxTree/AndKeyword.fs
@@ -1,2 +1,3 @@
+
 let rec a b = b + 1
-and d e = e + 1
\ No newline at end of file
+and d e = e + 1
diff --git a/tests/service/data/SyntaxTree/AndKeyword.fs.bsl b/tests/service/data/SyntaxTree/AndKeyword.fs.bsl
index bcad0af343b..9963f81c43d 100644
--- a/tests/service/data/SyntaxTree/AndKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/AndKeyword.fs.bsl
@@ -7,7 +7,7 @@ ImplFile
              (true,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -18,8 +18,8 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (b, None), false, None,
-                           /root/AndKeyword.fs (1,10--1,11))], None,
-                     /root/AndKeyword.fs (1,8--1,11)), None,
+                           /root/AndKeyword.fs (2,10--2,11))], None,
+                     /root/AndKeyword.fs (2,8--2,11)), None,
                   App
                     (NonAtomic, false,
                      App
@@ -28,20 +28,20 @@ ImplFile
                           (false,
                            SynLongIdent
                              ([op_Addition], [], [Some (OriginalNotation "+")]),
-                           None, /root/AndKeyword.fs (1,16--1,17)), Ident b,
-                        /root/AndKeyword.fs (1,14--1,17)),
-                     Const (Int32 1, /root/AndKeyword.fs (1,18--1,19)),
-                     /root/AndKeyword.fs (1,14--1,19)),
-                  /root/AndKeyword.fs (1,8--1,11), NoneAtLet,
+                           None, /root/AndKeyword.fs (2,16--2,17)), Ident b,
+                        /root/AndKeyword.fs (2,14--2,17)),
+                     Const (Int32 1, /root/AndKeyword.fs (2,18--2,19)),
+                     /root/AndKeyword.fs (2,14--2,19)),
+                  /root/AndKeyword.fs (2,8--2,11), NoneAtLet,
                   { LeadingKeyword =
                      LetRec
-                       (/root/AndKeyword.fs (1,0--1,3),
-                        /root/AndKeyword.fs (1,4--1,7))
+                       (/root/AndKeyword.fs (2,0--2,3),
+                        /root/AndKeyword.fs (2,4--2,7))
                     InlineKeyword = None
-                    EqualsRange = Some /root/AndKeyword.fs (1,12--1,13) });
+                    EqualsRange = Some /root/AndKeyword.fs (2,12--2,13) });
                SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -52,8 +52,8 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (e, None), false, None,
-                           /root/AndKeyword.fs (2,6--2,7))], None,
-                     /root/AndKeyword.fs (2,4--2,7)), None,
+                           /root/AndKeyword.fs (3,6--3,7))], None,
+                     /root/AndKeyword.fs (3,4--3,7)), None,
                   App
                     (NonAtomic, false,
                      App
@@ -62,15 +62,15 @@ ImplFile
                           (false,
                            SynLongIdent
                              ([op_Addition], [], [Some (OriginalNotation "+")]),
-                           None, /root/AndKeyword.fs (2,12--2,13)), Ident e,
-                        /root/AndKeyword.fs (2,10--2,13)),
-                     Const (Int32 1, /root/AndKeyword.fs (2,14--2,15)),
-                     /root/AndKeyword.fs (2,10--2,15)),
-                  /root/AndKeyword.fs (2,4--2,7), NoneAtLet,
-                  { LeadingKeyword = And /root/AndKeyword.fs (2,0--2,3)
+                           None, /root/AndKeyword.fs (3,12--3,13)), Ident e,
+                        /root/AndKeyword.fs (3,10--3,13)),
+                     Const (Int32 1, /root/AndKeyword.fs (3,14--3,15)),
+                     /root/AndKeyword.fs (3,10--3,15)),
+                  /root/AndKeyword.fs (3,4--3,7), NoneAtLet,
+                  { LeadingKeyword = And /root/AndKeyword.fs (3,0--3,3)
                     InlineKeyword = None
-                    EqualsRange = Some /root/AndKeyword.fs (2,8--2,9) })],
-              /root/AndKeyword.fs (1,0--2,15))], PreXmlDocEmpty, [], None,
-          /root/AndKeyword.fs (1,0--2,15), { LeadingKeyword = None })],
+                    EqualsRange = Some /root/AndKeyword.fs (3,8--3,9) })],
+              /root/AndKeyword.fs (2,0--3,15))], PreXmlDocEmpty, [], None,
+          /root/AndKeyword.fs (2,0--4,0), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs b/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs
index eb103ad8ab1..087fac654cb 100644
--- a/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs
+++ b/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs
@@ -1,2 +1,3 @@
+
 type X =
-    abstract member Y: [<Foo; Bar>] ?a: A -> B
\ No newline at end of file
+    abstract member Y: [<Foo; Bar>] ?a: A -> B
diff --git a/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs.bsl b/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs.bsl
index 73fc19424e0..56aae9a2766 100644
--- a/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs.bsl
+++ b/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/AttributesInOptionalNamedMemberParameter.fs (1,5--1,6)),
+                     /root/AttributesInOptionalNamedMemberParameter.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AbstractSlot
@@ -25,30 +25,30 @@ ImplFile
                                          ArgExpr =
                                           Const
                                             (Unit,
-                                             /root/AttributesInOptionalNamedMemberParameter.fs (2,25--2,28))
+                                             /root/AttributesInOptionalNamedMemberParameter.fs (3,25--3,28))
                                          Target = None
                                          AppliesToGetterAndSetter = false
                                          Range =
-                                          /root/AttributesInOptionalNamedMemberParameter.fs (2,25--2,28) };
+                                          /root/AttributesInOptionalNamedMemberParameter.fs (3,25--3,28) };
                                        { TypeName =
                                           SynLongIdent ([Bar], [], [None])
                                          ArgExpr =
                                           Const
                                             (Unit,
-                                             /root/AttributesInOptionalNamedMemberParameter.fs (2,30--2,33))
+                                             /root/AttributesInOptionalNamedMemberParameter.fs (3,30--3,33))
                                          Target = None
                                          AppliesToGetterAndSetter = false
                                          Range =
-                                          /root/AttributesInOptionalNamedMemberParameter.fs (2,30--2,33) }]
+                                          /root/AttributesInOptionalNamedMemberParameter.fs (3,30--3,33) }]
                                      Range =
-                                      /root/AttributesInOptionalNamedMemberParameter.fs (2,23--2,35) }],
+                                      /root/AttributesInOptionalNamedMemberParameter.fs (3,23--3,35) }],
                                   true, Some a,
                                   LongIdent (SynLongIdent ([A], [], [None])),
-                                  /root/AttributesInOptionalNamedMemberParameter.fs (2,23--2,41)),
+                                  /root/AttributesInOptionalNamedMemberParameter.fs (3,23--3,41)),
                                LongIdent (SynLongIdent ([B], [], [None])),
-                               /root/AttributesInOptionalNamedMemberParameter.fs (2,23--2,46),
+                               /root/AttributesInOptionalNamedMemberParameter.fs (3,23--3,46),
                                { ArrowRange =
-                                  /root/AttributesInOptionalNamedMemberParameter.fs (2,42--2,44) }),
+                                  /root/AttributesInOptionalNamedMemberParameter.fs (3,42--3,44) }),
                             SynValInfo
                               ([[SynArgInfo
                                    ([{ Attributes =
@@ -57,32 +57,32 @@ ImplFile
                                            ArgExpr =
                                             Const
                                               (Unit,
-                                               /root/AttributesInOptionalNamedMemberParameter.fs (2,25--2,28))
+                                               /root/AttributesInOptionalNamedMemberParameter.fs (3,25--3,28))
                                            Target = None
                                            AppliesToGetterAndSetter = false
                                            Range =
-                                            /root/AttributesInOptionalNamedMemberParameter.fs (2,25--2,28) };
+                                            /root/AttributesInOptionalNamedMemberParameter.fs (3,25--3,28) };
                                          { TypeName =
                                             SynLongIdent ([Bar], [], [None])
                                            ArgExpr =
                                             Const
                                               (Unit,
-                                               /root/AttributesInOptionalNamedMemberParameter.fs (2,30--2,33))
+                                               /root/AttributesInOptionalNamedMemberParameter.fs (3,30--3,33))
                                            Target = None
                                            AppliesToGetterAndSetter = false
                                            Range =
-                                            /root/AttributesInOptionalNamedMemberParameter.fs (2,30--2,33) }]
+                                            /root/AttributesInOptionalNamedMemberParameter.fs (3,30--3,33) }]
                                        Range =
-                                        /root/AttributesInOptionalNamedMemberParameter.fs (2,23--2,35) }],
+                                        /root/AttributesInOptionalNamedMemberParameter.fs (3,23--3,35) }],
                                     true, Some a)]],
                                SynArgInfo ([], false, None)), false, false,
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/AttributesInOptionalNamedMemberParameter.fs (2,4--2,46),
+                            /root/AttributesInOptionalNamedMemberParameter.fs (3,4--3,46),
                             { LeadingKeyword =
                                AbstractMember
-                                 (/root/AttributesInOptionalNamedMemberParameter.fs (2,4--2,12),
-                                  /root/AttributesInOptionalNamedMemberParameter.fs (2,13--2,19))
+                                 (/root/AttributesInOptionalNamedMemberParameter.fs (3,4--3,12),
+                                  /root/AttributesInOptionalNamedMemberParameter.fs (3,13--3,19))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -92,21 +92,21 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/AttributesInOptionalNamedMemberParameter.fs (2,4--2,46),
+                         /root/AttributesInOptionalNamedMemberParameter.fs (3,4--3,46),
                          { GetSetKeywords = None })],
-                     /root/AttributesInOptionalNamedMemberParameter.fs (2,4--2,46)),
+                     /root/AttributesInOptionalNamedMemberParameter.fs (3,4--3,46)),
                   [], None,
-                  /root/AttributesInOptionalNamedMemberParameter.fs (1,5--2,46),
+                  /root/AttributesInOptionalNamedMemberParameter.fs (2,5--3,46),
                   { LeadingKeyword =
                      Type
-                       /root/AttributesInOptionalNamedMemberParameter.fs (1,0--1,4)
+                       /root/AttributesInOptionalNamedMemberParameter.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/AttributesInOptionalNamedMemberParameter.fs (1,7--1,8)
+                       /root/AttributesInOptionalNamedMemberParameter.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/AttributesInOptionalNamedMemberParameter.fs (1,0--2,46))],
+              /root/AttributesInOptionalNamedMemberParameter.fs (2,0--3,46))],
           PreXmlDocEmpty, [], None,
-          /root/AttributesInOptionalNamedMemberParameter.fs (1,0--2,46),
+          /root/AttributesInOptionalNamedMemberParameter.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi b/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi
index 4b1761ae383..e05771452a7 100644
--- a/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi
+++ b/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi
@@ -1,3 +1,4 @@
+
 namespace Meh
 
-val a (* b *) : int
\ No newline at end of file
+val a (* b *) : int
diff --git a/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi.bsl
index 3a7a41f6c09..727d7deaac8 100644
--- a/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi.bsl
@@ -9,23 +9,23 @@ SigFile
                 ([], SynIdent (a, None), SynValTyparDecls (None, true),
                  LongIdent (SynLongIdent ([int], [], [None])),
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
                  None,
-                 /root/BlockCommentInSourceCode,SignatureFile.fsi (3,0--3,19),
+                 /root/BlockCommentInSourceCode,SignatureFile.fsi (4,0--4,19),
                  { LeadingKeyword =
                     Val
-                      /root/BlockCommentInSourceCode,SignatureFile.fsi (3,0--3,3)
+                      /root/BlockCommentInSourceCode,SignatureFile.fsi (4,0--4,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/BlockCommentInSourceCode,SignatureFile.fsi (3,0--3,19))],
+              /root/BlockCommentInSourceCode,SignatureFile.fsi (4,0--4,19))],
           PreXmlDocEmpty, [], None,
-          /root/BlockCommentInSourceCode,SignatureFile.fsi (1,0--3,19),
+          /root/BlockCommentInSourceCode,SignatureFile.fsi (2,0--4,19),
           { LeadingKeyword =
              Namespace
-               /root/BlockCommentInSourceCode,SignatureFile.fsi (1,0--1,9) })],
+               /root/BlockCommentInSourceCode,SignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments =
          [BlockComment
-            /root/BlockCommentInSourceCode,SignatureFile.fsi (3,6--3,13)] },
+            /root/BlockCommentInSourceCode,SignatureFile.fsi (4,6--4,13)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs b/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs
index 9919d73b770..418933b4541 100644
--- a/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs
+++ b/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs
@@ -1 +1,2 @@
-let a (* b *)  c = c + 42
\ No newline at end of file
+
+let a (* b *)  c = c + 42
diff --git a/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs.bsl b/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs.bsl
index 634e92dcbb1..90c53620634 100644
--- a/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs.bsl
+++ b/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -19,8 +19,8 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (c, None), false, None,
-                           /root/BlockCommentInSourceCode.fs (1,15--1,16))],
-                     None, /root/BlockCommentInSourceCode.fs (1,4--1,16)), None,
+                           /root/BlockCommentInSourceCode.fs (2,15--2,16))],
+                     None, /root/BlockCommentInSourceCode.fs (2,4--2,16)), None,
                   App
                     (NonAtomic, false,
                      App
@@ -29,20 +29,20 @@ ImplFile
                           (false,
                            SynLongIdent
                              ([op_Addition], [], [Some (OriginalNotation "+")]),
-                           None, /root/BlockCommentInSourceCode.fs (1,21--1,22)),
-                        Ident c, /root/BlockCommentInSourceCode.fs (1,19--1,22)),
+                           None, /root/BlockCommentInSourceCode.fs (2,21--2,22)),
+                        Ident c, /root/BlockCommentInSourceCode.fs (2,19--2,22)),
                      Const
-                       (Int32 42, /root/BlockCommentInSourceCode.fs (1,23--1,25)),
-                     /root/BlockCommentInSourceCode.fs (1,19--1,25)),
-                  /root/BlockCommentInSourceCode.fs (1,4--1,16), NoneAtLet,
+                       (Int32 42, /root/BlockCommentInSourceCode.fs (2,23--2,25)),
+                     /root/BlockCommentInSourceCode.fs (2,19--2,25)),
+                  /root/BlockCommentInSourceCode.fs (2,4--2,16), NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/BlockCommentInSourceCode.fs (1,0--1,3)
+                     Let /root/BlockCommentInSourceCode.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
-                     Some /root/BlockCommentInSourceCode.fs (1,17--1,18) })],
-              /root/BlockCommentInSourceCode.fs (1,0--1,25))], PreXmlDocEmpty,
-          [], None, /root/BlockCommentInSourceCode.fs (1,0--1,25),
+                     Some /root/BlockCommentInSourceCode.fs (2,17--2,18) })],
+              /root/BlockCommentInSourceCode.fs (2,0--2,25))], PreXmlDocEmpty,
+          [], None, /root/BlockCommentInSourceCode.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
-         [BlockComment /root/BlockCommentInSourceCode.fs (1,6--1,13)] }, set []))
\ No newline at end of file
+         [BlockComment /root/BlockCommentInSourceCode.fs (2,6--2,13)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs
index 1dc8211b83b..f1f03b7e6da 100644
--- a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs
+++ b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs
@@ -1 +1,2 @@
-let x y : int = failwith "todo"
\ No newline at end of file
+
+let x y : int = failwith "todo"
diff --git a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
index bb2963283e0..9e7febedbae 100644
--- a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -19,39 +19,39 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (y, None), false, None,
-                           /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,6--1,7))],
+                           /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,6--2,7))],
                      None,
-                     /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,4--1,7)),
+                     /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,4--2,7)),
                   Some
                     (SynBindingReturnInfo
                        (LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,10--1,13),
+                        /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,10--2,13),
                         [],
                         { ColonRange =
                            Some
-                             /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,8--1,9) })),
+                             /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,8--2,9) })),
                   Typed
                     (App
                        (NonAtomic, false, Ident failwith,
                         Const
                           (String
                              ("todo", Regular,
-                              /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,25--1,31)),
-                           /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,25--1,31)),
-                        /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,16--1,31)),
+                              /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,25--2,31)),
+                           /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,25--2,31)),
+                        /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,16--2,31)),
                      LongIdent (SynLongIdent ([int], [], [None])),
-                     /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,16--1,31)),
-                  /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,4--1,7),
+                     /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,16--2,31)),
+                  /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,4--2,7),
                   NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,0--1,3)
+                     Let /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,14--1,15) })],
-              /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,0--1,31))],
+                       /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,14--2,15) })],
+              /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,0--2,31))],
           PreXmlDocEmpty, [], None,
-          /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (1,0--1,31),
+          /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs
index 07ed16ffa00..ebc75404851 100644
--- a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs
+++ b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs
@@ -1,2 +1,3 @@
+
 type X =
-    member this.Y with get():int = 1 and set (_:int):unit = ()
\ No newline at end of file
+    member this.Y with get():int = 1 and set (_:int):unit = ()
diff --git a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
index 7da91f90182..30a9dabd57e 100644
--- a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
+++ b/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
@@ -9,9 +9,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (1,5--1,6)),
+                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [GetSetMember
@@ -19,7 +19,7 @@ ImplFile
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -34,45 +34,45 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; Y],
-                                     [/root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,15--2,16)],
+                                     [/root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,15--3,16)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,26--2,28)),
-                                        /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,26--2,28))],
+                                           /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,26--3,28)),
+                                        /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,26--3,28))],
                                   None,
-                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,23--2,28)),
+                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,23--3,28)),
                                Some
                                  (SynBindingReturnInfo
                                     (LongIdent
                                        (SynLongIdent ([int], [], [None])),
-                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,29--2,32),
+                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,29--3,32),
                                      [],
                                      { ColonRange =
                                         Some
-                                          /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,28--2,29) })),
+                                          /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,28--3,29) })),
                                Typed
                                  (Const
                                     (Int32 1,
-                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,35--2,36)),
+                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,35--3,36)),
                                   LongIdent (SynLongIdent ([int], [], [None])),
-                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,35--2,36)),
-                               /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,23--2,28),
+                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,35--3,36)),
+                               /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,23--3,28),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,4--2,10)
+                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,4--3,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,33--2,34) })),
+                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,33--3,34) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -88,69 +88,69 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; Y],
-                                     [/root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,15--2,16)],
+                                     [/root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,15--3,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Typed
                                           (Wild
-                                             /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,46--2,47),
+                                             /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,46--3,47),
                                            LongIdent
                                              (SynLongIdent ([int], [], [None])),
-                                           /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,46--2,51)),
-                                        /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,45--2,52))],
+                                           /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,46--3,51)),
+                                        /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,45--3,52))],
                                   None,
-                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,41--2,52)),
+                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,41--3,52)),
                                Some
                                  (SynBindingReturnInfo
                                     (LongIdent
                                        (SynLongIdent ([unit], [], [None])),
-                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,53--2,57),
+                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,53--3,57),
                                      [],
                                      { ColonRange =
                                         Some
-                                          /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,52--2,53) })),
+                                          /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,52--3,53) })),
                                Typed
                                  (Const
                                     (Unit,
-                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,60--2,62)),
+                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,60--3,62)),
                                   LongIdent (SynLongIdent ([unit], [], [None])),
-                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,60--2,62)),
-                               /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,41--2,52),
+                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,60--3,62)),
+                               /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,41--3,52),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,4--2,10)
+                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,4--3,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,58--2,59) })),
-                         /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,4--2,62),
+                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,58--3,59) })),
+                         /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,4--3,62),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,18--2,22)
+                            /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,18--3,22)
                            GetKeyword =
                             Some
-                              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,23--2,26)
+                              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,23--3,26)
                            AndKeyword =
                             Some
-                              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,37--2,40)
+                              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,37--3,40)
                            SetKeyword =
                             Some
-                              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,41--2,44) })],
-                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,4--2,62)),
+                              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,41--3,44) })],
+                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,4--3,62)),
                   [], None,
-                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (1,5--2,62),
+                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,5--3,62),
                   { LeadingKeyword =
                      Type
-                       /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (1,0--1,4)
+                       /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (1,7--1,8)
+                       /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (1,0--2,62))],
+              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,0--3,62))],
           PreXmlDocEmpty, [], None,
-          /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (1,0--2,62),
+          /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi b/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi
index 81bdd7846fd..da120cd601c 100644
--- a/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi
+++ b/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi
@@ -1,3 +1,4 @@
+
 namespace Meh
 
-val foo : int // comment!
\ No newline at end of file
+val foo : int // comment!
diff --git a/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi.bsl
index 3f8f30f3075..f93aab2a2d2 100644
--- a/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi.bsl
@@ -9,22 +9,22 @@ SigFile
                 ([], SynIdent (foo, None), SynValTyparDecls (None, true),
                  LongIdent (SynLongIdent ([int], [], [None])),
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
                  None,
-                 /root/CommentAfterSourceCode,SignatureFile.fsi (3,0--3,13),
+                 /root/CommentAfterSourceCode,SignatureFile.fsi (4,0--4,13),
                  { LeadingKeyword =
                     Val
-                      /root/CommentAfterSourceCode,SignatureFile.fsi (3,0--3,3)
+                      /root/CommentAfterSourceCode,SignatureFile.fsi (4,0--4,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/CommentAfterSourceCode,SignatureFile.fsi (3,0--3,13))],
+              /root/CommentAfterSourceCode,SignatureFile.fsi (4,0--4,13))],
           PreXmlDocEmpty, [], None,
-          /root/CommentAfterSourceCode,SignatureFile.fsi (1,0--3,13),
+          /root/CommentAfterSourceCode,SignatureFile.fsi (2,0--4,13),
           { LeadingKeyword =
-             Namespace /root/CommentAfterSourceCode,SignatureFile.fsi (1,0--1,9) })],
+             Namespace /root/CommentAfterSourceCode,SignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/CommentAfterSourceCode,SignatureFile.fsi (3,14--3,25)] },
+            /root/CommentAfterSourceCode,SignatureFile.fsi (4,14--4,25)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs b/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs
index 27f5776aae0..0cc8da46d78 100644
--- a/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs
+++ b/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs
@@ -1 +1,2 @@
-foo() // comment!
\ No newline at end of file
+
+foo() // comment!
diff --git a/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs.bsl b/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs.bsl
index 54f31927c8f..68753b24fa3 100644
--- a/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs.bsl
+++ b/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs.bsl
@@ -7,11 +7,11 @@ ImplFile
           [Expr
              (App
                 (Atomic, false, Ident foo,
-                 Const (Unit, /root/CommentAfterSourceCode.fs (1,3--1,5)),
-                 /root/CommentAfterSourceCode.fs (1,0--1,5)),
-              /root/CommentAfterSourceCode.fs (1,0--1,5))], PreXmlDocEmpty, [],
-          None, /root/CommentAfterSourceCode.fs (1,0--1,5),
+                 Const (Unit, /root/CommentAfterSourceCode.fs (2,3--2,5)),
+                 /root/CommentAfterSourceCode.fs (2,0--2,5)),
+              /root/CommentAfterSourceCode.fs (2,0--2,5))], PreXmlDocEmpty, [],
+          None, /root/CommentAfterSourceCode.fs (2,0--2,5),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [LineComment /root/CommentAfterSourceCode.fs (1,6--1,17)] },
+        CodeComments = [LineComment /root/CommentAfterSourceCode.fs (2,6--2,17)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs b/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs
index 1f2e5c84288..9c26afdd8f0 100644
--- a/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs
+++ b/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs
@@ -1 +1,2 @@
-x // y
\ No newline at end of file
+
+x // y
diff --git a/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs.bsl b/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs.bsl
index 64a08501776..47509b108ec 100644
--- a/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs.bsl
+++ b/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs.bsl
@@ -4,9 +4,9 @@ ImplFile
       QualifiedNameOfFile CommentAtEndOfFile, [], [],
       [SynModuleOrNamespace
          ([CommentAtEndOfFile], false, AnonModule,
-          [Expr (Ident x, /root/CommentAtEndOfFile.fs (1,0--1,1))],
-          PreXmlDocEmpty, [], None, /root/CommentAtEndOfFile.fs (1,0--1,1),
+          [Expr (Ident x, /root/CommentAtEndOfFile.fs (2,0--2,1))],
+          PreXmlDocEmpty, [], None, /root/CommentAtEndOfFile.fs (2,0--2,1),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [LineComment /root/CommentAtEndOfFile.fs (1,2--1,6)] },
+        CodeComments = [LineComment /root/CommentAtEndOfFile.fs (2,2--2,6)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs b/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs
index cc7bd4175e4..bbed0993ad0 100644
--- a/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs
+++ b/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs
@@ -1,4 +1,5 @@
+
 if a then
 b
 else (* some long comment here *) if c then
-d
\ No newline at end of file
+d
diff --git a/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs.bsl b/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs.bsl
index e9a00367cc5..b8d64152334 100644
--- a/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs.bsl
+++ b/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs.bsl
@@ -10,27 +10,27 @@ ImplFile
                  Some
                    (IfThenElse
                       (Ident c, Ident d, None,
-                       Yes /root/CommentBetweenElseAndIf.fs (3,34--3,43), false,
-                       /root/CommentBetweenElseAndIf.fs (3,34--4,1),
+                       Yes /root/CommentBetweenElseAndIf.fs (4,34--4,43), false,
+                       /root/CommentBetweenElseAndIf.fs (4,34--5,1),
                        { IfKeyword =
-                          /root/CommentBetweenElseAndIf.fs (3,34--3,36)
+                          /root/CommentBetweenElseAndIf.fs (4,34--4,36)
                          IsElif = false
                          ThenKeyword =
-                          /root/CommentBetweenElseAndIf.fs (3,39--3,43)
+                          /root/CommentBetweenElseAndIf.fs (4,39--4,43)
                          ElseKeyword = None
                          IfToThenRange =
-                          /root/CommentBetweenElseAndIf.fs (3,34--3,43) })),
-                 Yes /root/CommentBetweenElseAndIf.fs (1,0--1,9), false,
-                 /root/CommentBetweenElseAndIf.fs (1,0--4,1),
-                 { IfKeyword = /root/CommentBetweenElseAndIf.fs (1,0--1,2)
+                          /root/CommentBetweenElseAndIf.fs (4,34--4,43) })),
+                 Yes /root/CommentBetweenElseAndIf.fs (2,0--2,9), false,
+                 /root/CommentBetweenElseAndIf.fs (2,0--5,1),
+                 { IfKeyword = /root/CommentBetweenElseAndIf.fs (2,0--2,2)
                    IsElif = false
-                   ThenKeyword = /root/CommentBetweenElseAndIf.fs (1,5--1,9)
+                   ThenKeyword = /root/CommentBetweenElseAndIf.fs (2,5--2,9)
                    ElseKeyword =
-                    Some /root/CommentBetweenElseAndIf.fs (3,0--3,4)
-                   IfToThenRange = /root/CommentBetweenElseAndIf.fs (1,0--1,9) }),
-              /root/CommentBetweenElseAndIf.fs (1,0--4,1))], PreXmlDocEmpty, [],
-          None, /root/CommentBetweenElseAndIf.fs (1,0--4,1),
+                    Some /root/CommentBetweenElseAndIf.fs (4,0--4,4)
+                   IfToThenRange = /root/CommentBetweenElseAndIf.fs (2,0--2,9) }),
+              /root/CommentBetweenElseAndIf.fs (2,0--5,1))], PreXmlDocEmpty, [],
+          None, /root/CommentBetweenElseAndIf.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
-         [BlockComment /root/CommentBetweenElseAndIf.fs (3,5--3,33)] }, set []))
\ No newline at end of file
+         [BlockComment /root/CommentBetweenElseAndIf.fs (4,5--4,33)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi b/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi
index 833b02ad643..06bee6c7066 100644
--- a/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi
+++ b/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi
@@ -1,3 +1,4 @@
+
 namespace Meh
 // comment!
-foo()
\ No newline at end of file
+foo()
diff --git a/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi.bsl
index 11b115f2c7c..c78da3ff460 100644
--- a/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi.bsl
@@ -4,10 +4,10 @@ SigFile
       QualifiedNameOfFile CommentOnSingleLine,SignatureFile, [], [],
       [SynModuleOrNamespaceSig
          ([Meh], false, DeclaredNamespace, [], PreXmlDocEmpty, [], None,
-          /root/CommentOnSingleLine,SignatureFile.fsi (1,0--1,13),
+          /root/CommentOnSingleLine,SignatureFile.fsi (2,0--2,13),
           { LeadingKeyword =
-             Namespace /root/CommentOnSingleLine,SignatureFile.fsi (1,0--1,9) })],
+             Namespace /root/CommentOnSingleLine,SignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/CommentOnSingleLine,SignatureFile.fsi (2,0--2,11)] },
+         [LineComment /root/CommentOnSingleLine,SignatureFile.fsi (3,0--3,11)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentOnSingleLine.fs b/tests/service/data/SyntaxTree/CommentOnSingleLine.fs
index 3f7c61a45d1..9f43e2d8a4f 100644
--- a/tests/service/data/SyntaxTree/CommentOnSingleLine.fs
+++ b/tests/service/data/SyntaxTree/CommentOnSingleLine.fs
@@ -1,2 +1,3 @@
+
 // comment!
-foo()
\ No newline at end of file
+foo()
diff --git a/tests/service/data/SyntaxTree/CommentOnSingleLine.fs.bsl b/tests/service/data/SyntaxTree/CommentOnSingleLine.fs.bsl
index 39ff1307120..1b9cbbebded 100644
--- a/tests/service/data/SyntaxTree/CommentOnSingleLine.fs.bsl
+++ b/tests/service/data/SyntaxTree/CommentOnSingleLine.fs.bsl
@@ -7,11 +7,11 @@ ImplFile
           [Expr
              (App
                 (Atomic, false, Ident foo,
-                 Const (Unit, /root/CommentOnSingleLine.fs (2,3--2,5)),
-                 /root/CommentOnSingleLine.fs (2,0--2,5)),
-              /root/CommentOnSingleLine.fs (2,0--2,5))], PreXmlDocEmpty, [],
-          None, /root/CommentOnSingleLine.fs (2,0--2,5),
+                 Const (Unit, /root/CommentOnSingleLine.fs (3,3--3,5)),
+                 /root/CommentOnSingleLine.fs (3,0--3,5)),
+              /root/CommentOnSingleLine.fs (3,0--3,5))], PreXmlDocEmpty, [],
+          None, /root/CommentOnSingleLine.fs (3,0--3,5),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [LineComment /root/CommentOnSingleLine.fs (1,0--1,11)] },
+        CodeComments = [LineComment /root/CommentOnSingleLine.fs (2,0--2,11)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs
index 44e91680772..84b90a40a2c 100644
--- a/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs
+++ b/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs
@@ -1,5 +1,6 @@
+
 fun (x, _) 
     ({ Y = h::_ }) 
     (SomePattern(z)) 
     -> 
-    x * y + z
\ No newline at end of file
+    x * y + z
diff --git a/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs.bsl
index 128a3d771a8..b8bb72b4a34 100644
--- a/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs.bsl
@@ -10,41 +10,41 @@ ImplFile
                  SimplePats
                    ([Id
                        (x, None, false, false, false,
-                        /root/ComplexArgumentsLambdaHasArrowRange.fs (1,5--1,6));
+                        /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,6));
                      Id
                        (_arg3, None, true, false, false,
-                        /root/ComplexArgumentsLambdaHasArrowRange.fs (1,8--1,9))],
-                    /root/ComplexArgumentsLambdaHasArrowRange.fs (1,4--1,10)),
+                        /root/ComplexArgumentsLambdaHasArrowRange.fs (2,8--2,9))],
+                    /root/ComplexArgumentsLambdaHasArrowRange.fs (2,4--2,10)),
                  Lambda
                    (false, true,
                     SimplePats
                       ([Id
                           (_arg2, None, true, false, false,
-                           /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,17))],
-                       /root/ComplexArgumentsLambdaHasArrowRange.fs (2,4--2,18)),
+                           /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17))],
+                       /root/ComplexArgumentsLambdaHasArrowRange.fs (3,4--3,18)),
                     Lambda
                       (false, true,
                        SimplePats
                          ([Id
                              (_arg1, None, true, false, false,
-                              /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,19))],
-                          /root/ComplexArgumentsLambdaHasArrowRange.fs (3,4--3,20)),
+                              /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19))],
+                          /root/ComplexArgumentsLambdaHasArrowRange.fs (4,4--4,20)),
                        Match
                          (NoneAtInvisible, Ident _arg2,
                           [SynMatchClause
                              (Record
                                 ([(([], Y),
-                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (2,9--2,10),
+                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (3,9--3,10),
                                    ListCons
                                      (Named
                                         (SynIdent (h, None), false, None,
-                                         /root/ComplexArgumentsLambdaHasArrowRange.fs (2,11--2,12)),
+                                         /root/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,12)),
                                       Wild
-                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (2,14--2,15),
-                                      /root/ComplexArgumentsLambdaHasArrowRange.fs (2,11--2,15),
+                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (3,14--3,15),
+                                      /root/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,15),
                                       { ColonColonRange =
-                                         /root/ComplexArgumentsLambdaHasArrowRange.fs (2,12--2,14) }))],
-                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,17)),
+                                         /root/ComplexArgumentsLambdaHasArrowRange.fs (3,12--3,14) }))],
+                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17)),
                               None,
                               Match
                                 (NoneAtInvisible, Ident _arg1,
@@ -56,10 +56,10 @@ ImplFile
                                           [Paren
                                              (Named
                                                 (SynIdent (z, None), false, None,
-                                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (3,17--3,18)),
-                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (3,16--3,19))],
+                                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (4,17--4,18)),
+                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (4,16--4,19))],
                                         None,
-                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,19)),
+                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19)),
                                      None,
                                      App
                                        (NonAtomic, false,
@@ -71,7 +71,7 @@ ImplFile
                                                 ([op_Addition], [],
                                                  [Some (OriginalNotation "+")]),
                                               None,
-                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (5,10--5,11)),
+                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (6,10--6,11)),
                                            App
                                              (NonAtomic, false,
                                               App
@@ -83,66 +83,66 @@ ImplFile
                                                        [Some
                                                           (OriginalNotation "*")]),
                                                     None,
-                                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (5,6--5,7)),
+                                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (6,6--6,7)),
                                                  Ident x,
-                                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,7)),
+                                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,7)),
                                               Ident y,
-                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,9)),
-                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,11)),
+                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,9)),
+                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,11)),
                                         Ident z,
-                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,13)),
-                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,19),
+                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,13)),
+                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19),
                                      No, { ArrowRange = None
                                            BarRange = None })],
-                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--5,13),
+                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13),
                                  { MatchKeyword =
-                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--5,13)
+                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13)
                                    WithKeyword =
-                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--5,13) }),
-                              /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,17),
+                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13) }),
+                              /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17),
                               No, { ArrowRange = None
                                     BarRange = None })],
-                          /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--5,13),
+                          /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13),
                           { MatchKeyword =
-                             /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--5,13)
+                             /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13)
                             WithKeyword =
-                             /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--5,13) }),
+                             /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13) }),
                        None,
-                       /root/ComplexArgumentsLambdaHasArrowRange.fs (1,0--5,13),
+                       /root/ComplexArgumentsLambdaHasArrowRange.fs (2,0--6,13),
                        { ArrowRange =
                           Some
-                            /root/ComplexArgumentsLambdaHasArrowRange.fs (4,4--4,6) }),
+                            /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,6) }),
                     None,
-                    /root/ComplexArgumentsLambdaHasArrowRange.fs (1,0--5,13),
+                    /root/ComplexArgumentsLambdaHasArrowRange.fs (2,0--6,13),
                     { ArrowRange =
                        Some
-                         /root/ComplexArgumentsLambdaHasArrowRange.fs (4,4--4,6) }),
+                         /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,6) }),
                  Some
                    ([Paren
                        (Tuple
                           (false,
                            [Named
                               (SynIdent (x, None), false, None,
-                               /root/ComplexArgumentsLambdaHasArrowRange.fs (1,5--1,6));
+                               /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,6));
                             Wild
-                              /root/ComplexArgumentsLambdaHasArrowRange.fs (1,8--1,9)],
-                           /root/ComplexArgumentsLambdaHasArrowRange.fs (1,5--1,9)),
-                        /root/ComplexArgumentsLambdaHasArrowRange.fs (1,4--1,10));
+                              /root/ComplexArgumentsLambdaHasArrowRange.fs (2,8--2,9)],
+                           /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,9)),
+                        /root/ComplexArgumentsLambdaHasArrowRange.fs (2,4--2,10));
                      Paren
                        (Record
                           ([(([], Y),
-                             /root/ComplexArgumentsLambdaHasArrowRange.fs (2,9--2,10),
+                             /root/ComplexArgumentsLambdaHasArrowRange.fs (3,9--3,10),
                              ListCons
                                (Named
                                   (SynIdent (h, None), false, None,
-                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (2,11--2,12)),
+                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,12)),
                                 Wild
-                                  /root/ComplexArgumentsLambdaHasArrowRange.fs (2,14--2,15),
-                                /root/ComplexArgumentsLambdaHasArrowRange.fs (2,11--2,15),
+                                  /root/ComplexArgumentsLambdaHasArrowRange.fs (3,14--3,15),
+                                /root/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,15),
                                 { ColonColonRange =
-                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (2,12--2,14) }))],
-                           /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,17)),
-                        /root/ComplexArgumentsLambdaHasArrowRange.fs (2,4--2,18));
+                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (3,12--3,14) }))],
+                           /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17)),
+                        /root/ComplexArgumentsLambdaHasArrowRange.fs (3,4--3,18));
                      Paren
                        (LongIdent
                           (SynLongIdent ([SomePattern], [], [None]), None, None,
@@ -150,27 +150,27 @@ ImplFile
                              [Paren
                                 (Named
                                    (SynIdent (z, None), false, None,
-                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (3,17--3,18)),
-                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (3,16--3,19))],
+                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (4,17--4,18)),
+                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (4,16--4,19))],
                            None,
-                           /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,19)),
-                        /root/ComplexArgumentsLambdaHasArrowRange.fs (3,4--3,20))],
+                           /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19)),
+                        /root/ComplexArgumentsLambdaHasArrowRange.fs (4,4--4,20))],
                     Match
                       (NoneAtInvisible, Ident _arg2,
                        [SynMatchClause
                           (Record
                              ([(([], Y),
-                                /root/ComplexArgumentsLambdaHasArrowRange.fs (2,9--2,10),
+                                /root/ComplexArgumentsLambdaHasArrowRange.fs (3,9--3,10),
                                 ListCons
                                   (Named
                                      (SynIdent (h, None), false, None,
-                                      /root/ComplexArgumentsLambdaHasArrowRange.fs (2,11--2,12)),
+                                      /root/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,12)),
                                    Wild
-                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (2,14--2,15),
-                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (2,11--2,15),
+                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (3,14--3,15),
+                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,15),
                                    { ColonColonRange =
-                                      /root/ComplexArgumentsLambdaHasArrowRange.fs (2,12--2,14) }))],
-                              /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,17)),
+                                      /root/ComplexArgumentsLambdaHasArrowRange.fs (3,12--3,14) }))],
+                              /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17)),
                            None,
                            Match
                              (NoneAtInvisible, Ident _arg1,
@@ -182,10 +182,10 @@ ImplFile
                                        [Paren
                                           (Named
                                              (SynIdent (z, None), false, None,
-                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (3,17--3,18)),
-                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (3,16--3,19))],
+                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (4,17--4,18)),
+                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (4,16--4,19))],
                                      None,
-                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,19)),
+                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19)),
                                   None,
                                   App
                                     (NonAtomic, false,
@@ -197,7 +197,7 @@ ImplFile
                                              ([op_Addition], [],
                                               [Some (OriginalNotation "+")]),
                                            None,
-                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (5,10--5,11)),
+                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (6,10--6,11)),
                                         App
                                           (NonAtomic, false,
                                            App
@@ -208,36 +208,36 @@ ImplFile
                                                    ([op_Multiply], [],
                                                     [Some (OriginalNotation "*")]),
                                                  None,
-                                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (5,6--5,7)),
+                                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (6,6--6,7)),
                                               Ident x,
-                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,7)),
+                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,7)),
                                            Ident y,
-                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,9)),
-                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,11)),
+                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,9)),
+                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,11)),
                                      Ident z,
-                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,13)),
-                                  /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,19),
+                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,13)),
+                                  /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19),
                                   No, { ArrowRange = None
                                         BarRange = None })],
-                              /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--5,13),
+                              /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13),
                               { MatchKeyword =
-                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--5,13)
+                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13)
                                 WithKeyword =
-                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--5,13) }),
-                           /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,17),
+                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13) }),
+                           /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17),
                            No, { ArrowRange = None
                                  BarRange = None })],
-                       /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--5,13),
+                       /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13),
                        { MatchKeyword =
-                          /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--5,13)
+                          /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13)
                          WithKeyword =
-                          /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--5,13) })),
-                 /root/ComplexArgumentsLambdaHasArrowRange.fs (1,0--5,13),
+                          /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13) })),
+                 /root/ComplexArgumentsLambdaHasArrowRange.fs (2,0--6,13),
                  { ArrowRange =
-                    Some /root/ComplexArgumentsLambdaHasArrowRange.fs (4,4--4,6) }),
-              /root/ComplexArgumentsLambdaHasArrowRange.fs (1,0--5,13))],
+                    Some /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,6) }),
+              /root/ComplexArgumentsLambdaHasArrowRange.fs (2,0--6,13))],
           PreXmlDocEmpty, [], None,
-          /root/ComplexArgumentsLambdaHasArrowRange.fs (1,0--5,13),
+          /root/ComplexArgumentsLambdaHasArrowRange.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs b/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs
index efeac2073b8..082d522fe2b 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs
+++ b/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs
@@ -1,5 +1,6 @@
+
 let 
 #if !FOO
     inline
 #endif
-    map f ar = Async.map (Result.map f) ar
\ No newline at end of file
+    map f ar = Async.map (Result.map f) ar
diff --git a/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs.bsl
index adbcd3650b1..0f8352899a8 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, true, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -20,12 +20,12 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (f, None), false, None,
-                           /root/ConditionalDirectiveAroundInlineKeyword.fs (5,8--5,9));
+                           /root/ConditionalDirectiveAroundInlineKeyword.fs (6,8--6,9));
                         Named
                           (SynIdent (ar, None), false, None,
-                           /root/ConditionalDirectiveAroundInlineKeyword.fs (5,10--5,12))],
+                           /root/ConditionalDirectiveAroundInlineKeyword.fs (6,10--6,12))],
                      None,
-                     /root/ConditionalDirectiveAroundInlineKeyword.fs (5,4--5,12)),
+                     /root/ConditionalDirectiveAroundInlineKeyword.fs (6,4--6,12)),
                   None,
                   App
                     (NonAtomic, false,
@@ -35,9 +35,9 @@ ImplFile
                           (false,
                            SynLongIdent
                              ([Async; map],
-                              [/root/ConditionalDirectiveAroundInlineKeyword.fs (5,20--5,21)],
+                              [/root/ConditionalDirectiveAroundInlineKeyword.fs (6,20--6,21)],
                               [None; None]), None,
-                           /root/ConditionalDirectiveAroundInlineKeyword.fs (5,15--5,24)),
+                           /root/ConditionalDirectiveAroundInlineKeyword.fs (6,15--6,24)),
                         Paren
                           (App
                              (NonAtomic, false,
@@ -45,36 +45,36 @@ ImplFile
                                 (false,
                                  SynLongIdent
                                    ([Result; map],
-                                    [/root/ConditionalDirectiveAroundInlineKeyword.fs (5,32--5,33)],
+                                    [/root/ConditionalDirectiveAroundInlineKeyword.fs (6,32--6,33)],
                                     [None; None]), None,
-                                 /root/ConditionalDirectiveAroundInlineKeyword.fs (5,26--5,36)),
+                                 /root/ConditionalDirectiveAroundInlineKeyword.fs (6,26--6,36)),
                               Ident f,
-                              /root/ConditionalDirectiveAroundInlineKeyword.fs (5,26--5,38)),
-                           /root/ConditionalDirectiveAroundInlineKeyword.fs (5,25--5,26),
+                              /root/ConditionalDirectiveAroundInlineKeyword.fs (6,26--6,38)),
+                           /root/ConditionalDirectiveAroundInlineKeyword.fs (6,25--6,26),
                            Some
-                             /root/ConditionalDirectiveAroundInlineKeyword.fs (5,38--5,39),
-                           /root/ConditionalDirectiveAroundInlineKeyword.fs (5,25--5,39)),
-                        /root/ConditionalDirectiveAroundInlineKeyword.fs (5,15--5,39)),
+                             /root/ConditionalDirectiveAroundInlineKeyword.fs (6,38--6,39),
+                           /root/ConditionalDirectiveAroundInlineKeyword.fs (6,25--6,39)),
+                        /root/ConditionalDirectiveAroundInlineKeyword.fs (6,15--6,39)),
                      Ident ar,
-                     /root/ConditionalDirectiveAroundInlineKeyword.fs (5,15--5,42)),
-                  /root/ConditionalDirectiveAroundInlineKeyword.fs (5,4--5,12),
+                     /root/ConditionalDirectiveAroundInlineKeyword.fs (6,15--6,42)),
+                  /root/ConditionalDirectiveAroundInlineKeyword.fs (6,4--6,12),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/ConditionalDirectiveAroundInlineKeyword.fs (1,0--1,3)
+                       /root/ConditionalDirectiveAroundInlineKeyword.fs (2,0--2,3)
                     InlineKeyword =
                      Some
-                       /root/ConditionalDirectiveAroundInlineKeyword.fs (3,4--3,10)
+                       /root/ConditionalDirectiveAroundInlineKeyword.fs (4,4--4,10)
                     EqualsRange =
                      Some
-                       /root/ConditionalDirectiveAroundInlineKeyword.fs (5,13--5,14) })],
-              /root/ConditionalDirectiveAroundInlineKeyword.fs (1,0--5,42))],
+                       /root/ConditionalDirectiveAroundInlineKeyword.fs (6,13--6,14) })],
+              /root/ConditionalDirectiveAroundInlineKeyword.fs (2,0--6,42))],
           PreXmlDocEmpty, [], None,
-          /root/ConditionalDirectiveAroundInlineKeyword.fs (1,0--5,42),
+          /root/ConditionalDirectiveAroundInlineKeyword.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives =
          [If
             (Not (Ident "FOO"),
-             /root/ConditionalDirectiveAroundInlineKeyword.fs (2,0--2,8));
-          EndIf /root/ConditionalDirectiveAroundInlineKeyword.fs (4,0--4,6)]
+             /root/ConditionalDirectiveAroundInlineKeyword.fs (3,0--3,8));
+          EndIf /root/ConditionalDirectiveAroundInlineKeyword.fs (5,0--5,6)]
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs b/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
index 3fc551e4c5b..6bce529e63f 100644
--- a/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
+++ b/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
@@ -1,4 +1,5 @@
+
 { foo with
         X
             =
-                12 }
\ No newline at end of file
+                12 }
diff --git a/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
index 66a0040950b..9b0ddb7057c 100644
--- a/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
+++ b/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
@@ -13,21 +13,21 @@ ImplFile
                 (None,
                  Some
                    (Ident foo,
-                    (/root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,6--1,10),
+                    (/root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,6--2,10),
                      None)),
                  [SynExprRecordField
                     ((SynLongIdent ([X], [], [None]), true),
                      Some
-                       /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,12--3,13),
+                       /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,12--4,13),
                      Some
                        (Const
                           (Int32 12,
-                           /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,16--4,18))),
+                           /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (5,16--5,18))),
                      None)],
-                 /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--4,20)),
-              /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--4,20))],
+                 /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--5,20)),
+              /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--5,20))],
           PreXmlDocEmpty, [], None,
-          /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--4,20),
+          /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--5,20),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs b/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs
index b24a2df8c18..1827cd84dea 100644
--- a/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs
+++ b/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs
@@ -1 +1,2 @@
-let (+) a b = a + b
\ No newline at end of file
+
+let (+) a b = a + b
diff --git a/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs.bsl b/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs.bsl
index 78724806ffd..c50e1109023 100644
--- a/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -20,17 +20,17 @@ ImplFile
                        ([op_Addition], [],
                         [Some
                            (OriginalNotationWithParen
-                              (/root/CustomOperatorDefinition.fs (1,4--1,5), "+",
-                               /root/CustomOperatorDefinition.fs (1,6--1,7)))]),
+                              (/root/CustomOperatorDefinition.fs (2,4--2,5), "+",
+                               /root/CustomOperatorDefinition.fs (2,6--2,7)))]),
                      None, None,
                      Pats
                        [Named
                           (SynIdent (a, None), false, None,
-                           /root/CustomOperatorDefinition.fs (1,8--1,9));
+                           /root/CustomOperatorDefinition.fs (2,8--2,9));
                         Named
                           (SynIdent (b, None), false, None,
-                           /root/CustomOperatorDefinition.fs (1,10--1,11))],
-                     None, /root/CustomOperatorDefinition.fs (1,4--1,11)), None,
+                           /root/CustomOperatorDefinition.fs (2,10--2,11))],
+                     None, /root/CustomOperatorDefinition.fs (2,4--2,11)), None,
                   App
                     (NonAtomic, false,
                      App
@@ -39,17 +39,17 @@ ImplFile
                           (false,
                            SynLongIdent
                              ([op_Addition], [], [Some (OriginalNotation "+")]),
-                           None, /root/CustomOperatorDefinition.fs (1,16--1,17)),
-                        Ident a, /root/CustomOperatorDefinition.fs (1,14--1,17)),
-                     Ident b, /root/CustomOperatorDefinition.fs (1,14--1,19)),
-                  /root/CustomOperatorDefinition.fs (1,4--1,11), NoneAtLet,
+                           None, /root/CustomOperatorDefinition.fs (2,16--2,17)),
+                        Ident a, /root/CustomOperatorDefinition.fs (2,14--2,17)),
+                     Ident b, /root/CustomOperatorDefinition.fs (2,14--2,19)),
+                  /root/CustomOperatorDefinition.fs (2,4--2,11), NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/CustomOperatorDefinition.fs (1,0--1,3)
+                     Let /root/CustomOperatorDefinition.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
-                     Some /root/CustomOperatorDefinition.fs (1,12--1,13) })],
-              /root/CustomOperatorDefinition.fs (1,0--1,19))], PreXmlDocEmpty,
-          [], None, /root/CustomOperatorDefinition.fs (1,0--1,19),
+                     Some /root/CustomOperatorDefinition.fs (2,12--2,13) })],
+              /root/CustomOperatorDefinition.fs (2,0--2,19))], PreXmlDocEmpty,
+          [], None, /root/CustomOperatorDefinition.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs b/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs
index d17e0b80a68..13780fd8b7a 100644
--- a/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs
+++ b/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs
@@ -1,4 +1,5 @@
+
 namespace TypeEquality
 
 /// A type for witnessing type equality between 'a and 'b
-type Teq<'a, 'b>
\ No newline at end of file
+type Teq<'a, 'b>
diff --git a/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
index 455556e5165..c81c6e40d0c 100644
--- a/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
@@ -13,27 +13,27 @@ ImplFile
                        (PostfixList
                           ([SynTyparDecl ([], SynTypar (a, None, false));
                             SynTyparDecl ([], SynTypar (b, None, false))], [],
-                           /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,8--4,16))),
+                           /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,8--5,16))),
                      [], [Teq],
-                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                      true, None,
-                     /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,5--4,8)),
+                     /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,5--5,8)),
                   Simple
                     (None
-                       /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,5--4,8),
-                     /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,5--4,8)),
+                       /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,5--5,8),
+                     /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,5--5,8)),
                   [], None,
-                  /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (3,0--4,8),
+                  /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,0--5,8),
                   { LeadingKeyword =
                      Type
-                       /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,0--4,4)
+                       /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,0--5,4)
                     EqualsRange = None
                     WithKeyword = None })],
-              /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (3,0--4,8))],
+              /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,0--5,8))],
           PreXmlDocEmpty, [], None,
-          /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (1,0--4,8),
+          /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (2,0--5,8),
           { LeadingKeyword =
              Namespace
-               /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (1,0--1,9) })],
+               /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (2,0--2,9) })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs b/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs
index 269c362cdce..b9929cbf6db 100644
--- a/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs
+++ b/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs
@@ -1,3 +1,4 @@
+
 if a then
     b
 elif c then
@@ -6,4 +7,4 @@ else
         if e then
             f
         else
-            g
\ No newline at end of file
+            g
diff --git a/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs.bsl
index 73bc9edae98..8928e27c437 100644
--- a/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs.bsl
+++ b/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs.bsl
@@ -13,36 +13,36 @@ ImplFile
                        Some
                          (IfThenElse
                             (Ident e, Ident f, Some (Ident g),
-                             Yes /root/DeeplyNestedIfThenElse.fs (6,8--6,17),
-                             false, /root/DeeplyNestedIfThenElse.fs (6,8--9,13),
+                             Yes /root/DeeplyNestedIfThenElse.fs (7,8--7,17),
+                             false, /root/DeeplyNestedIfThenElse.fs (7,8--10,13),
                              { IfKeyword =
-                                /root/DeeplyNestedIfThenElse.fs (6,8--6,10)
+                                /root/DeeplyNestedIfThenElse.fs (7,8--7,10)
                                IsElif = false
                                ThenKeyword =
-                                /root/DeeplyNestedIfThenElse.fs (6,13--6,17)
+                                /root/DeeplyNestedIfThenElse.fs (7,13--7,17)
                                ElseKeyword =
-                                Some /root/DeeplyNestedIfThenElse.fs (8,8--8,12)
+                                Some /root/DeeplyNestedIfThenElse.fs (9,8--9,12)
                                IfToThenRange =
-                                /root/DeeplyNestedIfThenElse.fs (6,8--6,17) })),
-                       Yes /root/DeeplyNestedIfThenElse.fs (3,0--3,11), false,
-                       /root/DeeplyNestedIfThenElse.fs (3,0--9,13),
-                       { IfKeyword = /root/DeeplyNestedIfThenElse.fs (3,0--3,4)
+                                /root/DeeplyNestedIfThenElse.fs (7,8--7,17) })),
+                       Yes /root/DeeplyNestedIfThenElse.fs (4,0--4,11), false,
+                       /root/DeeplyNestedIfThenElse.fs (4,0--10,13),
+                       { IfKeyword = /root/DeeplyNestedIfThenElse.fs (4,0--4,4)
                          IsElif = true
                          ThenKeyword =
-                          /root/DeeplyNestedIfThenElse.fs (3,7--3,11)
+                          /root/DeeplyNestedIfThenElse.fs (4,7--4,11)
                          ElseKeyword =
-                          Some /root/DeeplyNestedIfThenElse.fs (5,0--5,4)
+                          Some /root/DeeplyNestedIfThenElse.fs (6,0--6,4)
                          IfToThenRange =
-                          /root/DeeplyNestedIfThenElse.fs (3,0--3,11) })),
-                 Yes /root/DeeplyNestedIfThenElse.fs (1,0--1,9), false,
-                 /root/DeeplyNestedIfThenElse.fs (1,0--9,13),
-                 { IfKeyword = /root/DeeplyNestedIfThenElse.fs (1,0--1,2)
+                          /root/DeeplyNestedIfThenElse.fs (4,0--4,11) })),
+                 Yes /root/DeeplyNestedIfThenElse.fs (2,0--2,9), false,
+                 /root/DeeplyNestedIfThenElse.fs (2,0--10,13),
+                 { IfKeyword = /root/DeeplyNestedIfThenElse.fs (2,0--2,2)
                    IsElif = false
-                   ThenKeyword = /root/DeeplyNestedIfThenElse.fs (1,5--1,9)
+                   ThenKeyword = /root/DeeplyNestedIfThenElse.fs (2,5--2,9)
                    ElseKeyword = None
-                   IfToThenRange = /root/DeeplyNestedIfThenElse.fs (1,0--1,9) }),
-              /root/DeeplyNestedIfThenElse.fs (1,0--9,13))], PreXmlDocEmpty, [],
-          None, /root/DeeplyNestedIfThenElse.fs (1,0--9,13),
+                   IfToThenRange = /root/DeeplyNestedIfThenElse.fs (2,0--2,9) }),
+              /root/DeeplyNestedIfThenElse.fs (2,0--10,13))], PreXmlDocEmpty, [],
+          None, /root/DeeplyNestedIfThenElse.fs (2,0--11,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DefaultKeyword.fsi b/tests/service/data/SyntaxTree/DefaultKeyword.fsi
index 10ea02f5280..274cbcf4e09 100644
--- a/tests/service/data/SyntaxTree/DefaultKeyword.fsi
+++ b/tests/service/data/SyntaxTree/DefaultKeyword.fsi
@@ -1,4 +1,5 @@
+
 namespace X
 
 type Y =
-    default F : int
\ No newline at end of file
+    default F : int
diff --git a/tests/service/data/SyntaxTree/DefaultKeyword.fsi.bsl b/tests/service/data/SyntaxTree/DefaultKeyword.fsi.bsl
index 1897b1d0b09..c132c25ae15 100644
--- a/tests/service/data/SyntaxTree/DefaultKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/DefaultKeyword.fsi.bsl
@@ -7,8 +7,8 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Y],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/DefaultKeyword.fsi (3,5--3,6)),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/DefaultKeyword.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -18,10 +18,10 @@ SigFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            None, None, /root/DefaultKeyword.fsi (4,4--4,19),
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, None, /root/DefaultKeyword.fsi (5,4--5,19),
                             { LeadingKeyword =
-                               Default /root/DefaultKeyword.fsi (4,4--4,11)
+                               Default /root/DefaultKeyword.fsi (5,4--5,11)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -31,14 +31,14 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/DefaultKeyword.fsi (4,4--4,19),
+                         /root/DefaultKeyword.fsi (5,4--5,19),
                          { GetSetKeywords = None })],
-                     /root/DefaultKeyword.fsi (4,4--4,19)), [],
-                  /root/DefaultKeyword.fsi (3,5--4,19),
-                  { LeadingKeyword = Type /root/DefaultKeyword.fsi (3,0--3,4)
-                    EqualsRange = Some /root/DefaultKeyword.fsi (3,7--3,8)
-                    WithKeyword = None })], /root/DefaultKeyword.fsi (3,0--4,19))],
-          PreXmlDocEmpty, [], None, /root/DefaultKeyword.fsi (1,0--4,19),
-          { LeadingKeyword = Namespace /root/DefaultKeyword.fsi (1,0--1,9) })],
+                     /root/DefaultKeyword.fsi (5,4--5,19)), [],
+                  /root/DefaultKeyword.fsi (4,5--5,19),
+                  { LeadingKeyword = Type /root/DefaultKeyword.fsi (4,0--4,4)
+                    EqualsRange = Some /root/DefaultKeyword.fsi (4,7--4,8)
+                    WithKeyword = None })], /root/DefaultKeyword.fsi (4,0--5,19))],
+          PreXmlDocEmpty, [], None, /root/DefaultKeyword.fsi (2,0--5,19),
+          { LeadingKeyword = Namespace /root/DefaultKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DefaultValKeyword.fs b/tests/service/data/SyntaxTree/DefaultValKeyword.fs
index fc8cd6b33f0..0b81ec9ddc7 100644
--- a/tests/service/data/SyntaxTree/DefaultValKeyword.fs
+++ b/tests/service/data/SyntaxTree/DefaultValKeyword.fs
@@ -1,2 +1,3 @@
+
 type Foo =
-    default val A : int = 1
\ No newline at end of file
+    default val A : int = 1
diff --git a/tests/service/data/SyntaxTree/DefaultValKeyword.fs.bsl b/tests/service/data/SyntaxTree/DefaultValKeyword.fs.bsl
index 935f1283a7e..b84c41e7a72 100644
--- a/tests/service/data/SyntaxTree/DefaultValKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/DefaultValKeyword.fs.bsl
@@ -8,8 +8,8 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/DefaultValKeyword.fs (1,5--1,8)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/DefaultValKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [AutoProperty
@@ -27,25 +27,25 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None,
                          Const
-                           (Int32 1, /root/DefaultValKeyword.fs (2,26--2,27)),
-                         /root/DefaultValKeyword.fs (2,4--2,27),
+                           (Int32 1, /root/DefaultValKeyword.fs (3,26--3,27)),
+                         /root/DefaultValKeyword.fs (3,4--3,27),
                          { LeadingKeyword =
                             DefaultVal
-                              (/root/DefaultValKeyword.fs (2,4--2,11),
-                               /root/DefaultValKeyword.fs (2,12--2,15))
+                              (/root/DefaultValKeyword.fs (3,4--3,11),
+                               /root/DefaultValKeyword.fs (3,12--3,15))
                            WithKeyword = None
                            EqualsRange =
-                            Some /root/DefaultValKeyword.fs (2,24--2,25)
+                            Some /root/DefaultValKeyword.fs (3,24--3,25)
                            GetSetKeywords = None })],
-                     /root/DefaultValKeyword.fs (2,4--2,27)), [], None,
-                  /root/DefaultValKeyword.fs (1,5--2,27),
-                  { LeadingKeyword = Type /root/DefaultValKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/DefaultValKeyword.fs (1,9--1,10)
+                     /root/DefaultValKeyword.fs (3,4--3,27)), [], None,
+                  /root/DefaultValKeyword.fs (2,5--3,27),
+                  { LeadingKeyword = Type /root/DefaultValKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/DefaultValKeyword.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/DefaultValKeyword.fs (1,0--2,27))], PreXmlDocEmpty, [], None,
-          /root/DefaultValKeyword.fs (1,0--2,27), { LeadingKeyword = None })],
+              /root/DefaultValKeyword.fs (2,0--3,27))], PreXmlDocEmpty, [], None,
+          /root/DefaultValKeyword.fs (2,0--4,0), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs
index 3ed9b6dbdae..612266ef632 100644
--- a/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs
+++ b/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs
@@ -1 +1,2 @@
-fun { X = x } -> x * 2
\ No newline at end of file
+
+fun { X = x } -> x * 2
diff --git a/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs.bsl
index 3ab71dd40b6..d39bbd1f207 100644
--- a/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs.bsl
@@ -10,18 +10,18 @@ ImplFile
                  SimplePats
                    ([Id
                        (_arg1, None, true, false, false,
-                        /root/DestructedLambdaHasArrowRange.fs (1,4--1,13))],
-                    /root/DestructedLambdaHasArrowRange.fs (1,4--1,13)),
+                        /root/DestructedLambdaHasArrowRange.fs (2,4--2,13))],
+                    /root/DestructedLambdaHasArrowRange.fs (2,4--2,13)),
                  Match
                    (NoneAtInvisible, Ident _arg1,
                     [SynMatchClause
                        (Record
                           ([(([], X),
-                             /root/DestructedLambdaHasArrowRange.fs (1,8--1,9),
+                             /root/DestructedLambdaHasArrowRange.fs (2,8--2,9),
                              Named
                                (SynIdent (x, None), false, None,
-                                /root/DestructedLambdaHasArrowRange.fs (1,10--1,11)))],
-                           /root/DestructedLambdaHasArrowRange.fs (1,4--1,13)),
+                                /root/DestructedLambdaHasArrowRange.fs (2,10--2,11)))],
+                           /root/DestructedLambdaHasArrowRange.fs (2,4--2,13)),
                         None,
                         App
                           (NonAtomic, false,
@@ -32,39 +32,39 @@ ImplFile
                                  SynLongIdent
                                    ([op_Multiply], [],
                                     [Some (OriginalNotation "*")]), None,
-                                 /root/DestructedLambdaHasArrowRange.fs (1,19--1,20)),
+                                 /root/DestructedLambdaHasArrowRange.fs (2,19--2,20)),
                               Ident x,
-                              /root/DestructedLambdaHasArrowRange.fs (1,17--1,20)),
+                              /root/DestructedLambdaHasArrowRange.fs (2,17--2,20)),
                            Const
                              (Int32 2,
-                              /root/DestructedLambdaHasArrowRange.fs (1,21--1,22)),
-                           /root/DestructedLambdaHasArrowRange.fs (1,17--1,22)),
-                        /root/DestructedLambdaHasArrowRange.fs (1,4--1,13), No,
+                              /root/DestructedLambdaHasArrowRange.fs (2,21--2,22)),
+                           /root/DestructedLambdaHasArrowRange.fs (2,17--2,22)),
+                        /root/DestructedLambdaHasArrowRange.fs (2,4--2,13), No,
                         { ArrowRange = None
                           BarRange = None })],
-                    /root/DestructedLambdaHasArrowRange.fs (1,4--1,22),
+                    /root/DestructedLambdaHasArrowRange.fs (2,4--2,22),
                     { MatchKeyword =
-                       /root/DestructedLambdaHasArrowRange.fs (1,4--1,22)
+                       /root/DestructedLambdaHasArrowRange.fs (2,4--2,22)
                       WithKeyword =
-                       /root/DestructedLambdaHasArrowRange.fs (1,4--1,22) }),
+                       /root/DestructedLambdaHasArrowRange.fs (2,4--2,22) }),
                  Some
                    ([Record
                        ([(([], X),
-                          /root/DestructedLambdaHasArrowRange.fs (1,8--1,9),
+                          /root/DestructedLambdaHasArrowRange.fs (2,8--2,9),
                           Named
                             (SynIdent (x, None), false, None,
-                             /root/DestructedLambdaHasArrowRange.fs (1,10--1,11)))],
-                        /root/DestructedLambdaHasArrowRange.fs (1,4--1,13))],
+                             /root/DestructedLambdaHasArrowRange.fs (2,10--2,11)))],
+                        /root/DestructedLambdaHasArrowRange.fs (2,4--2,13))],
                     Match
                       (NoneAtInvisible, Ident _arg1,
                        [SynMatchClause
                           (Record
                              ([(([], X),
-                                /root/DestructedLambdaHasArrowRange.fs (1,8--1,9),
+                                /root/DestructedLambdaHasArrowRange.fs (2,8--2,9),
                                 Named
                                   (SynIdent (x, None), false, None,
-                                   /root/DestructedLambdaHasArrowRange.fs (1,10--1,11)))],
-                              /root/DestructedLambdaHasArrowRange.fs (1,4--1,13)),
+                                   /root/DestructedLambdaHasArrowRange.fs (2,10--2,11)))],
+                              /root/DestructedLambdaHasArrowRange.fs (2,4--2,13)),
                            None,
                            App
                              (NonAtomic, false,
@@ -75,27 +75,27 @@ ImplFile
                                     SynLongIdent
                                       ([op_Multiply], [],
                                        [Some (OriginalNotation "*")]), None,
-                                    /root/DestructedLambdaHasArrowRange.fs (1,19--1,20)),
+                                    /root/DestructedLambdaHasArrowRange.fs (2,19--2,20)),
                                  Ident x,
-                                 /root/DestructedLambdaHasArrowRange.fs (1,17--1,20)),
+                                 /root/DestructedLambdaHasArrowRange.fs (2,17--2,20)),
                               Const
                                 (Int32 2,
-                                 /root/DestructedLambdaHasArrowRange.fs (1,21--1,22)),
-                              /root/DestructedLambdaHasArrowRange.fs (1,17--1,22)),
-                           /root/DestructedLambdaHasArrowRange.fs (1,4--1,13),
+                                 /root/DestructedLambdaHasArrowRange.fs (2,21--2,22)),
+                              /root/DestructedLambdaHasArrowRange.fs (2,17--2,22)),
+                           /root/DestructedLambdaHasArrowRange.fs (2,4--2,13),
                            No, { ArrowRange = None
                                  BarRange = None })],
-                       /root/DestructedLambdaHasArrowRange.fs (1,4--1,22),
+                       /root/DestructedLambdaHasArrowRange.fs (2,4--2,22),
                        { MatchKeyword =
-                          /root/DestructedLambdaHasArrowRange.fs (1,4--1,22)
+                          /root/DestructedLambdaHasArrowRange.fs (2,4--2,22)
                          WithKeyword =
-                          /root/DestructedLambdaHasArrowRange.fs (1,4--1,22) })),
-                 /root/DestructedLambdaHasArrowRange.fs (1,0--1,22),
+                          /root/DestructedLambdaHasArrowRange.fs (2,4--2,22) })),
+                 /root/DestructedLambdaHasArrowRange.fs (2,0--2,22),
                  { ArrowRange =
-                    Some /root/DestructedLambdaHasArrowRange.fs (1,14--1,16) }),
-              /root/DestructedLambdaHasArrowRange.fs (1,0--1,22))],
+                    Some /root/DestructedLambdaHasArrowRange.fs (2,14--2,16) }),
+              /root/DestructedLambdaHasArrowRange.fs (2,0--2,22))],
           PreXmlDocEmpty, [], None,
-          /root/DestructedLambdaHasArrowRange.fs (1,0--1,22),
+          /root/DestructedLambdaHasArrowRange.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs b/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs
index bc6aeda6ce3..4028727f18a 100644
--- a/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs
+++ b/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs
@@ -1,2 +1,3 @@
+
 (+) a b
-op_Addition a b
\ No newline at end of file
+op_Addition a b
diff --git a/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs.bsl b/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs.bsl
index 6fa22d49e95..7c3aad23fa2 100644
--- a/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs.bsl
+++ b/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs.bsl
@@ -15,27 +15,27 @@ ImplFile
                          ([op_Addition], [],
                           [Some
                              (OriginalNotationWithParen
-                                (/root/DetectDifferenceBetweenCompiledOperators.fs (1,0--1,1),
+                                (/root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,1),
                                  "+",
-                                 /root/DetectDifferenceBetweenCompiledOperators.fs (1,2--1,3)))]),
+                                 /root/DetectDifferenceBetweenCompiledOperators.fs (2,2--2,3)))]),
                        None,
-                       /root/DetectDifferenceBetweenCompiledOperators.fs (1,0--1,3)),
+                       /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,3)),
                     Ident a,
-                    /root/DetectDifferenceBetweenCompiledOperators.fs (1,0--1,5)),
+                    /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,5)),
                  Ident b,
-                 /root/DetectDifferenceBetweenCompiledOperators.fs (1,0--1,7)),
-              /root/DetectDifferenceBetweenCompiledOperators.fs (1,0--1,7));
+                 /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,7)),
+              /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,7));
            Expr
              (App
                 (NonAtomic, false,
                  App
                    (NonAtomic, false, Ident op_Addition, Ident a,
-                    /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,13)),
+                    /root/DetectDifferenceBetweenCompiledOperators.fs (3,0--3,13)),
                  Ident b,
-                 /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,15)),
-              /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,15))],
+                 /root/DetectDifferenceBetweenCompiledOperators.fs (3,0--3,15)),
+              /root/DetectDifferenceBetweenCompiledOperators.fs (3,0--3,15))],
           PreXmlDocEmpty, [], None,
-          /root/DetectDifferenceBetweenCompiledOperators.fs (1,0--2,15),
+          /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--3,15),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi
index d0aee5943ba..2026af69d23 100644
--- a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi
@@ -1,3 +1,4 @@
+
 namespace Foobar
 
 val v : int =
@@ -6,4 +7,4 @@ val v : int =
 ()
 #endif
 *)
-42
\ No newline at end of file
+42
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi.bsl
index a6e00f498ac..cf33b06921e 100644
--- a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi.bsl
@@ -10,28 +10,28 @@ SigFile
                 ([], SynIdent (v, None), SynValTyparDecls (None, true),
                  LongIdent (SynLongIdent ([int], [], [None])),
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
                  Some
                    (Const
                       (Int32 42,
-                       /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (9,0--9,2))),
-                 /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (3,0--9,2),
+                       /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (10,0--10,2))),
+                 /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (4,0--10,2),
                  { LeadingKeyword =
                     Val
-                      /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (3,0--3,3)
+                      /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (4,0--4,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange =
                     Some
-                      /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (3,12--3,13) }),
-              /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (3,0--9,2))],
+                      /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (4,12--4,13) }),
+              /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (4,0--10,2))],
           PreXmlDocEmpty, [], None,
-          /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (1,0--9,2),
+          /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (2,0--10,2),
           { LeadingKeyword =
              Namespace
-               /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (1,0--1,9) })],
+               /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments =
          [BlockComment
-            /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (4,0--8,2)] },
+            /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (5,0--9,2)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs
index 167dd88a795..8b924a335bd 100644
--- a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs
@@ -1,7 +1,8 @@
+
 let v =
 (*
 #if DEBUG
 ()
 #endif
 *)
-42
\ No newline at end of file
+42
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
index 21b3369fd4f..dcc09cf8e4f 100644
--- a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
@@ -10,32 +10,32 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (v, None), false, None,
-                     /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,4--1,5)),
+                     /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,4--2,5)),
                   None,
                   Const
                     (Int32 42,
-                     /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (7,0--7,2)),
-                  /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,4--1,5),
+                     /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (8,0--8,2)),
+                  /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,4--2,5),
                   Yes
-                    /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,0--7,2),
+                    /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--8,2),
                   { LeadingKeyword =
                      Let
-                       /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,0--1,3)
+                       /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,6--1,7) })],
-              /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,0--7,2))],
+                       /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,6--2,7) })],
+              /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--8,2))],
           PreXmlDocEmpty, [], None,
-          /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (1,0--7,2),
+          /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--9,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [BlockComment
-            /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--6,2)] },
+            /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (3,0--7,2)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi
index 3c53f3d5d91..851cc685764 100644
--- a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi
@@ -1,3 +1,4 @@
+
 namespace Foobar
 
 let v : string = \"\"\"
@@ -5,4 +6,4 @@ let v : string = \"\"\"
 ()
 #endif
 42
-\"\"\"
\ No newline at end of file
+\"\"\"
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi.bsl
index 48d82cc3072..cb5d7710a2e 100644
--- a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi.bsl
@@ -5,9 +5,9 @@ SigFile
         DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile, [], [],
       [SynModuleOrNamespaceSig
          ([Foobar], false, DeclaredNamespace, [], PreXmlDocEmpty, [], None,
-          /root/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi (1,0--1,16),
+          /root/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi (2,0--2,16),
           { LeadingKeyword =
              Namespace
-               /root/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi (1,0--1,9) })],
+               /root/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs
index 63b17a70ac1..ed467babe36 100644
--- a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs
@@ -1,6 +1,7 @@
+
 let v = \"\"\"
 #if DEBUG
 ()
 #endif
 42
-\"\"\"
\ No newline at end of file
+\"\"\"
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
index 2b43709c8a0..69bba87af27 100644
--- a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
@@ -9,29 +9,29 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (v, None), false, None,
-                     /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,4--1,5)),
+                     /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,4--2,5)),
                   None,
                   ArbitraryAfterError
                     ("localBinding1",
-                     /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,7--1,7)),
-                  /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,4--1,5),
+                     /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,7--2,7)),
+                  /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,4--2,5),
                   Yes
-                    /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,4--1,7),
+                    /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,4--2,7),
                   { LeadingKeyword =
                      Let
-                       /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,0--1,3)
+                       /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,6--1,7) })],
-              /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,0--1,7))],
+                       /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,6--2,7) })],
+              /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,0--2,7))],
           PreXmlDocEmpty, [], None,
-          /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (1,0--6,6),
+          /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,0--8,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DoKeyword.fs b/tests/service/data/SyntaxTree/DoKeyword.fs
index 6ad35567a34..062a4ece226 100644
--- a/tests/service/data/SyntaxTree/DoKeyword.fs
+++ b/tests/service/data/SyntaxTree/DoKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    do ()
\ No newline at end of file
+    do ()
diff --git a/tests/service/data/SyntaxTree/DoKeyword.fs.bsl b/tests/service/data/SyntaxTree/DoKeyword.fs.bsl
index 879728af9bc..d1e4d0ba847 100644
--- a/tests/service/data/SyntaxTree/DoKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/DoKeyword.fs.bsl
@@ -7,8 +7,8 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/DoKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/DoKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [LetBindings
@@ -18,19 +18,19 @@ ImplFile
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
                                 None),
-                             Const (Unit, /root/DoKeyword.fs (2,4--2,9)), None,
-                             Const (Unit, /root/DoKeyword.fs (2,7--2,9)),
-                             /root/DoKeyword.fs (2,4--2,9), NoneAtDo,
-                             { LeadingKeyword = Do /root/DoKeyword.fs (2,4--2,6)
+                             Const (Unit, /root/DoKeyword.fs (3,4--3,9)), None,
+                             Const (Unit, /root/DoKeyword.fs (3,7--3,9)),
+                             /root/DoKeyword.fs (3,4--3,9), NoneAtDo,
+                             { LeadingKeyword = Do /root/DoKeyword.fs (3,4--3,6)
                                InlineKeyword = None
                                EqualsRange = None })], false, false,
-                         /root/DoKeyword.fs (2,4--2,9))],
-                     /root/DoKeyword.fs (2,4--2,9)), [], None,
-                  /root/DoKeyword.fs (1,5--2,9),
-                  { LeadingKeyword = Type /root/DoKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/DoKeyword.fs (1,7--1,8)
-                    WithKeyword = None })], /root/DoKeyword.fs (1,0--2,9))],
-          PreXmlDocEmpty, [], None, /root/DoKeyword.fs (1,0--2,9),
+                         /root/DoKeyword.fs (3,4--3,9))],
+                     /root/DoKeyword.fs (3,4--3,9)), [], None,
+                  /root/DoKeyword.fs (2,5--3,9),
+                  { LeadingKeyword = Type /root/DoKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/DoKeyword.fs (2,7--2,8)
+                    WithKeyword = None })], /root/DoKeyword.fs (2,0--3,9))],
+          PreXmlDocEmpty, [], None, /root/DoKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DoStaticKeyword.fs b/tests/service/data/SyntaxTree/DoStaticKeyword.fs
index 5badcd7f29b..707510a6c69 100644
--- a/tests/service/data/SyntaxTree/DoStaticKeyword.fs
+++ b/tests/service/data/SyntaxTree/DoStaticKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    static do ()
\ No newline at end of file
+    static do ()
diff --git a/tests/service/data/SyntaxTree/DoStaticKeyword.fs.bsl b/tests/service/data/SyntaxTree/DoStaticKeyword.fs.bsl
index 619fd81c636..223f7d7746d 100644
--- a/tests/service/data/SyntaxTree/DoStaticKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/DoStaticKeyword.fs.bsl
@@ -8,8 +8,8 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/DoStaticKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/DoStaticKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [LetBindings
@@ -19,23 +19,23 @@ ImplFile
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
                                 None),
-                             Const (Unit, /root/DoStaticKeyword.fs (2,11--2,16)),
+                             Const (Unit, /root/DoStaticKeyword.fs (3,11--3,16)),
                              None,
-                             Const (Unit, /root/DoStaticKeyword.fs (2,14--2,16)),
-                             /root/DoStaticKeyword.fs (2,11--2,16), NoneAtDo,
+                             Const (Unit, /root/DoStaticKeyword.fs (3,14--3,16)),
+                             /root/DoStaticKeyword.fs (3,11--3,16), NoneAtDo,
                              { LeadingKeyword =
                                 StaticDo
-                                  (/root/DoStaticKeyword.fs (2,4--2,10),
-                                   /root/DoStaticKeyword.fs (2,11--2,13))
+                                  (/root/DoStaticKeyword.fs (3,4--3,10),
+                                   /root/DoStaticKeyword.fs (3,11--3,13))
                                InlineKeyword = None
                                EqualsRange = None })], true, false,
-                         /root/DoStaticKeyword.fs (2,4--2,16))],
-                     /root/DoStaticKeyword.fs (2,4--2,16)), [], None,
-                  /root/DoStaticKeyword.fs (1,5--2,16),
-                  { LeadingKeyword = Type /root/DoStaticKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/DoStaticKeyword.fs (1,7--1,8)
-                    WithKeyword = None })], /root/DoStaticKeyword.fs (1,0--2,16))],
-          PreXmlDocEmpty, [], None, /root/DoStaticKeyword.fs (1,0--2,16),
+                         /root/DoStaticKeyword.fs (3,4--3,16))],
+                     /root/DoStaticKeyword.fs (3,4--3,16)), [], None,
+                  /root/DoStaticKeyword.fs (2,5--3,16),
+                  { LeadingKeyword = Type /root/DoStaticKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/DoStaticKeyword.fs (2,7--2,8)
+                    WithKeyword = None })], /root/DoStaticKeyword.fs (2,0--3,16))],
+          PreXmlDocEmpty, [], None, /root/DoStaticKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs b/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs
index c129fcfc192..5e31acf7159 100644
--- a/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs
+++ b/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs
@@ -1 +1,2 @@
-if a then b else c
\ No newline at end of file
+
+if a then b else c
diff --git a/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs.bsl
index a31c19c89d7..4e6db64c116 100644
--- a/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs.bsl
+++ b/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs.bsl
@@ -7,19 +7,19 @@ ImplFile
           [Expr
              (IfThenElse
                 (Ident a, Ident b, Some (Ident c),
-                 Yes /root/ElseKeywordInSimpleIfThenElse.fs (1,0--1,9), false,
-                 /root/ElseKeywordInSimpleIfThenElse.fs (1,0--1,18),
-                 { IfKeyword = /root/ElseKeywordInSimpleIfThenElse.fs (1,0--1,2)
+                 Yes /root/ElseKeywordInSimpleIfThenElse.fs (2,0--2,9), false,
+                 /root/ElseKeywordInSimpleIfThenElse.fs (2,0--2,18),
+                 { IfKeyword = /root/ElseKeywordInSimpleIfThenElse.fs (2,0--2,2)
                    IsElif = false
                    ThenKeyword =
-                    /root/ElseKeywordInSimpleIfThenElse.fs (1,5--1,9)
+                    /root/ElseKeywordInSimpleIfThenElse.fs (2,5--2,9)
                    ElseKeyword =
-                    Some /root/ElseKeywordInSimpleIfThenElse.fs (1,12--1,16)
+                    Some /root/ElseKeywordInSimpleIfThenElse.fs (2,12--2,16)
                    IfToThenRange =
-                    /root/ElseKeywordInSimpleIfThenElse.fs (1,0--1,9) }),
-              /root/ElseKeywordInSimpleIfThenElse.fs (1,0--1,18))],
+                    /root/ElseKeywordInSimpleIfThenElse.fs (2,0--2,9) }),
+              /root/ElseKeywordInSimpleIfThenElse.fs (2,0--2,18))],
           PreXmlDocEmpty, [], None,
-          /root/ElseKeywordInSimpleIfThenElse.fs (1,0--1,18),
+          /root/ElseKeywordInSimpleIfThenElse.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi
index d7a9a200183..9a639eb3418 100644
--- a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi
+++ b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi
@@ -1,4 +1,5 @@
+
 module Meh
 
 type X =
-    member a : int = 10
\ No newline at end of file
+    member a : int = 10
diff --git a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi.bsl b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
index c5ba228a335..5ed8d127373 100644
--- a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
+++ b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
@@ -8,9 +8,9 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/EqualsTokenIsPresentInSynValSigMember.fsi (3,5--3,6)),
+                     /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -20,43 +20,43 @@ SigFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
                             Some
                               (Const
                                  (Int32 10,
-                                  /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,21--4,23))),
-                            /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,4--4,23),
+                                  /root/EqualsTokenIsPresentInSynValSigMember.fsi (5,21--5,23))),
+                            /root/EqualsTokenIsPresentInSynValSigMember.fsi (5,4--5,23),
                             { LeadingKeyword =
                                Member
-                                 /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,4--4,10)
+                                 /root/EqualsTokenIsPresentInSynValSigMember.fsi (5,4--5,10)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange =
                                Some
-                                 /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,19--4,20) }),
+                                 /root/EqualsTokenIsPresentInSynValSigMember.fsi (5,19--5,20) }),
                          { IsInstance = true
                            IsDispatchSlot = false
                            IsOverrideOrExplicitImpl = false
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,4--4,23),
+                         /root/EqualsTokenIsPresentInSynValSigMember.fsi (5,4--5,23),
                          { GetSetKeywords = None })],
-                     /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,4--4,23)),
+                     /root/EqualsTokenIsPresentInSynValSigMember.fsi (5,4--5,23)),
                   [],
-                  /root/EqualsTokenIsPresentInSynValSigMember.fsi (3,5--4,23),
+                  /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,5--5,23),
                   { LeadingKeyword =
                      Type
-                       /root/EqualsTokenIsPresentInSynValSigMember.fsi (3,0--3,4)
+                       /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/EqualsTokenIsPresentInSynValSigMember.fsi (3,7--3,8)
+                       /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/EqualsTokenIsPresentInSynValSigMember.fsi (3,0--4,23))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/EqualsTokenIsPresentInSynValSigMember.fsi (1,0--4,23),
+              /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,0--5,23))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/EqualsTokenIsPresentInSynValSigMember.fsi (2,0--5,23),
           { LeadingKeyword =
-             Module /root/EqualsTokenIsPresentInSynValSigMember.fsi (1,0--1,6) })],
+             Module /root/EqualsTokenIsPresentInSynValSigMember.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi
index bb6a882c0e9..4d955ef3c95 100644
--- a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi
+++ b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi
@@ -1,3 +1,4 @@
+
 module Meh
 
-val a : int = 9
\ No newline at end of file
+val a : int = 9
diff --git a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi.bsl b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
index 7ce6bd5bcf8..9000b5380d6 100644
--- a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
+++ b/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
@@ -9,24 +9,24 @@ SigFile
                 ([], SynIdent (a, None), SynValTyparDecls (None, true),
                  LongIdent (SynLongIdent ([int], [], [None])),
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
                  Some
                    (Const
                       (Int32 9,
-                       /root/EqualsTokenIsPresentInSynValSigValue.fsi (3,14--3,15))),
-                 /root/EqualsTokenIsPresentInSynValSigValue.fsi (3,0--3,15),
+                       /root/EqualsTokenIsPresentInSynValSigValue.fsi (4,14--4,15))),
+                 /root/EqualsTokenIsPresentInSynValSigValue.fsi (4,0--4,15),
                  { LeadingKeyword =
                     Val
-                      /root/EqualsTokenIsPresentInSynValSigValue.fsi (3,0--3,3)
+                      /root/EqualsTokenIsPresentInSynValSigValue.fsi (4,0--4,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange =
                     Some
-                      /root/EqualsTokenIsPresentInSynValSigValue.fsi (3,12--3,13) }),
-              /root/EqualsTokenIsPresentInSynValSigValue.fsi (3,0--3,15))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/EqualsTokenIsPresentInSynValSigValue.fsi (1,0--3,15),
+                      /root/EqualsTokenIsPresentInSynValSigValue.fsi (4,12--4,13) }),
+              /root/EqualsTokenIsPresentInSynValSigValue.fsi (4,0--4,15))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/EqualsTokenIsPresentInSynValSigValue.fsi (2,0--4,15),
           { LeadingKeyword =
-             Module /root/EqualsTokenIsPresentInSynValSigValue.fsi (1,0--1,6) })],
+             Module /root/EqualsTokenIsPresentInSynValSigValue.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ExternKeyword.fs b/tests/service/data/SyntaxTree/ExternKeyword.fs
index b64978d72f5..48352eb8912 100644
--- a/tests/service/data/SyntaxTree/ExternKeyword.fs
+++ b/tests/service/data/SyntaxTree/ExternKeyword.fs
@@ -1 +1,2 @@
-extern void Meh()
\ No newline at end of file
+
+extern void Meh()
diff --git a/tests/service/data/SyntaxTree/ExternKeyword.fs.bsl b/tests/service/data/SyntaxTree/ExternKeyword.fs.bsl
index a7af819bef2..2a6ccc6add8 100644
--- a/tests/service/data/SyntaxTree/ExternKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/ExternKeyword.fs.bsl
@@ -7,15 +7,15 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([Meh], [], [None]), None,
                      Some (SynValTyparDecls (None, false)),
                      Pats
-                       [Tuple (false, [], /root/ExternKeyword.fs (1,15--1,16))],
-                     None, /root/ExternKeyword.fs (1,12--1,15)),
+                       [Tuple (false, [], /root/ExternKeyword.fs (2,15--2,16))],
+                     None, /root/ExternKeyword.fs (2,12--2,15)),
                   Some
                     (SynBindingReturnInfo
                        (App
@@ -23,8 +23,8 @@ ImplFile
                              (SynLongIdent
                                 ([unit], [], [Some (OriginalNotation "void")])),
                            None, [], [], None, false,
-                           /root/ExternKeyword.fs (1,7--1,11)),
-                        /root/ExternKeyword.fs (1,7--1,11), [],
+                           /root/ExternKeyword.fs (2,7--2,11)),
+                        /root/ExternKeyword.fs (2,7--2,11), [],
                         { ColonRange = None })),
                   Typed
                     (App
@@ -32,21 +32,21 @@ ImplFile
                         Const
                           (String
                              ("extern was not given a DllImport attribute",
-                              Regular, /root/ExternKeyword.fs (1,16--1,17)),
-                           /root/ExternKeyword.fs (1,16--1,17)),
-                        /root/ExternKeyword.fs (1,0--1,17)),
+                              Regular, /root/ExternKeyword.fs (2,16--2,17)),
+                           /root/ExternKeyword.fs (2,16--2,17)),
+                        /root/ExternKeyword.fs (2,0--2,17)),
                      App
                        (LongIdent
                           (SynLongIdent
                              ([unit], [], [Some (OriginalNotation "void")])),
                         None, [], [], None, false,
-                        /root/ExternKeyword.fs (1,7--1,11)),
-                     /root/ExternKeyword.fs (1,0--1,17)),
-                  /root/ExternKeyword.fs (1,0--1,17), NoneAtInvisible,
-                  { LeadingKeyword = Extern /root/ExternKeyword.fs (1,0--1,6)
+                        /root/ExternKeyword.fs (2,7--2,11)),
+                     /root/ExternKeyword.fs (2,0--2,17)),
+                  /root/ExternKeyword.fs (2,0--2,17), NoneAtInvisible,
+                  { LeadingKeyword = Extern /root/ExternKeyword.fs (2,0--2,6)
                     InlineKeyword = None
-                    EqualsRange = None })], /root/ExternKeyword.fs (1,0--1,17))],
-          PreXmlDocEmpty, [], None, /root/ExternKeyword.fs (1,0--1,17),
+                    EqualsRange = None })], /root/ExternKeyword.fs (2,0--2,17))],
+          PreXmlDocEmpty, [], None, /root/ExternKeyword.fs (2,0--2,17),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs b/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs
index a9c60114b21..f329fe0ce6d 100644
--- a/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs
+++ b/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs
@@ -1 +1,2 @@
-extern void GetProcessHeap()
\ No newline at end of file
+
+extern void GetProcessHeap()
diff --git a/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs.bsl b/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs.bsl
index b82b9f3b6a8..dd36a40d49b 100644
--- a/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None),
                   LongIdent
@@ -17,8 +17,8 @@ ImplFile
                      Pats
                        [Tuple
                           (false, [],
-                           /root/ExternKeywordIsPresentInTrivia.fs (1,26--1,27))],
-                     None, /root/ExternKeywordIsPresentInTrivia.fs (1,12--1,26)),
+                           /root/ExternKeywordIsPresentInTrivia.fs (2,26--2,27))],
+                     None, /root/ExternKeywordIsPresentInTrivia.fs (2,12--2,26)),
                   Some
                     (SynBindingReturnInfo
                        (App
@@ -26,8 +26,8 @@ ImplFile
                              (SynLongIdent
                                 ([unit], [], [Some (OriginalNotation "void")])),
                            None, [], [], None, false,
-                           /root/ExternKeywordIsPresentInTrivia.fs (1,7--1,11)),
-                        /root/ExternKeywordIsPresentInTrivia.fs (1,7--1,11), [],
+                           /root/ExternKeywordIsPresentInTrivia.fs (2,7--2,11)),
+                        /root/ExternKeywordIsPresentInTrivia.fs (2,7--2,11), [],
                         { ColonRange = None })),
                   Typed
                     (App
@@ -36,25 +36,25 @@ ImplFile
                           (String
                              ("extern was not given a DllImport attribute",
                               Regular,
-                              /root/ExternKeywordIsPresentInTrivia.fs (1,27--1,28)),
-                           /root/ExternKeywordIsPresentInTrivia.fs (1,27--1,28)),
-                        /root/ExternKeywordIsPresentInTrivia.fs (1,0--1,28)),
+                              /root/ExternKeywordIsPresentInTrivia.fs (2,27--2,28)),
+                           /root/ExternKeywordIsPresentInTrivia.fs (2,27--2,28)),
+                        /root/ExternKeywordIsPresentInTrivia.fs (2,0--2,28)),
                      App
                        (LongIdent
                           (SynLongIdent
                              ([unit], [], [Some (OriginalNotation "void")])),
                         None, [], [], None, false,
-                        /root/ExternKeywordIsPresentInTrivia.fs (1,7--1,11)),
-                     /root/ExternKeywordIsPresentInTrivia.fs (1,0--1,28)),
-                  /root/ExternKeywordIsPresentInTrivia.fs (1,0--1,28),
+                        /root/ExternKeywordIsPresentInTrivia.fs (2,7--2,11)),
+                     /root/ExternKeywordIsPresentInTrivia.fs (2,0--2,28)),
+                  /root/ExternKeywordIsPresentInTrivia.fs (2,0--2,28),
                   NoneAtInvisible,
                   { LeadingKeyword =
-                     Extern /root/ExternKeywordIsPresentInTrivia.fs (1,0--1,6)
+                     Extern /root/ExternKeywordIsPresentInTrivia.fs (2,0--2,6)
                     InlineKeyword = None
                     EqualsRange = None })],
-              /root/ExternKeywordIsPresentInTrivia.fs (1,0--1,28))],
+              /root/ExternKeywordIsPresentInTrivia.fs (2,0--2,28))],
           PreXmlDocEmpty, [], None,
-          /root/ExternKeywordIsPresentInTrivia.fs (1,0--1,28),
+          /root/ExternKeywordIsPresentInTrivia.fs (2,0--2,28),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs b/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs
index c41b917e43b..deacb2fc635 100644
--- a/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs
+++ b/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs
@@ -1,4 +1,5 @@
+
 type X =
     member inline x.Y 
         with inline get () = 4
-        and inline set y = ()
\ No newline at end of file
+        and inline set y = ()
diff --git a/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs.bsl
index 9e71505bebe..e1bff5838b3 100644
--- a/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/GetSetMemberWithInlineKeyword.fs (1,5--1,6)),
+                     /root/GetSetMemberWithInlineKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [GetSetMember
@@ -18,7 +18,7 @@ ImplFile
                            (SynBinding
                               (None, Normal, true, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -33,36 +33,36 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([x; Y],
-                                     [/root/GetSetMemberWithInlineKeyword.fs (2,19--2,20)],
+                                     [/root/GetSetMemberWithInlineKeyword.fs (3,19--3,20)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/GetSetMemberWithInlineKeyword.fs (3,24--3,26)),
-                                        /root/GetSetMemberWithInlineKeyword.fs (3,24--3,26))],
+                                           /root/GetSetMemberWithInlineKeyword.fs (4,24--4,26)),
+                                        /root/GetSetMemberWithInlineKeyword.fs (4,24--4,26))],
                                   None,
-                                  /root/GetSetMemberWithInlineKeyword.fs (3,20--3,26)),
+                                  /root/GetSetMemberWithInlineKeyword.fs (4,20--4,26)),
                                None,
                                Const
                                  (Int32 4,
-                                  /root/GetSetMemberWithInlineKeyword.fs (3,29--3,30)),
-                               /root/GetSetMemberWithInlineKeyword.fs (3,20--3,26),
+                                  /root/GetSetMemberWithInlineKeyword.fs (4,29--4,30)),
+                               /root/GetSetMemberWithInlineKeyword.fs (4,20--4,26),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/GetSetMemberWithInlineKeyword.fs (2,4--2,10)
+                                    /root/GetSetMemberWithInlineKeyword.fs (3,4--3,10)
                                  InlineKeyword =
                                   Some
-                                    /root/GetSetMemberWithInlineKeyword.fs (3,13--3,19)
+                                    /root/GetSetMemberWithInlineKeyword.fs (4,13--4,19)
                                  EqualsRange =
                                   Some
-                                    /root/GetSetMemberWithInlineKeyword.fs (3,27--3,28) })),
+                                    /root/GetSetMemberWithInlineKeyword.fs (4,27--4,28) })),
                          Some
                            (SynBinding
                               (None, Normal, true, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -78,54 +78,54 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([x; Y],
-                                     [/root/GetSetMemberWithInlineKeyword.fs (2,19--2,20)],
+                                     [/root/GetSetMemberWithInlineKeyword.fs (3,19--3,20)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Named
                                        (SynIdent (y, None), false, None,
-                                        /root/GetSetMemberWithInlineKeyword.fs (4,23--4,24))],
+                                        /root/GetSetMemberWithInlineKeyword.fs (5,23--5,24))],
                                   None,
-                                  /root/GetSetMemberWithInlineKeyword.fs (4,19--4,24)),
+                                  /root/GetSetMemberWithInlineKeyword.fs (5,19--5,24)),
                                None,
                                Const
                                  (Unit,
-                                  /root/GetSetMemberWithInlineKeyword.fs (4,27--4,29)),
-                               /root/GetSetMemberWithInlineKeyword.fs (4,19--4,24),
+                                  /root/GetSetMemberWithInlineKeyword.fs (5,27--5,29)),
+                               /root/GetSetMemberWithInlineKeyword.fs (5,19--5,24),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/GetSetMemberWithInlineKeyword.fs (2,4--2,10)
+                                    /root/GetSetMemberWithInlineKeyword.fs (3,4--3,10)
                                  InlineKeyword =
                                   Some
-                                    /root/GetSetMemberWithInlineKeyword.fs (4,12--4,18)
+                                    /root/GetSetMemberWithInlineKeyword.fs (5,12--5,18)
                                  EqualsRange =
                                   Some
-                                    /root/GetSetMemberWithInlineKeyword.fs (4,25--4,26) })),
-                         /root/GetSetMemberWithInlineKeyword.fs (2,4--4,29),
+                                    /root/GetSetMemberWithInlineKeyword.fs (5,25--5,26) })),
+                         /root/GetSetMemberWithInlineKeyword.fs (3,4--5,29),
                          { InlineKeyword =
                             Some
-                              /root/GetSetMemberWithInlineKeyword.fs (2,11--2,17)
+                              /root/GetSetMemberWithInlineKeyword.fs (3,11--3,17)
                            WithKeyword =
-                            /root/GetSetMemberWithInlineKeyword.fs (3,8--3,12)
+                            /root/GetSetMemberWithInlineKeyword.fs (4,8--4,12)
                            GetKeyword =
                             Some
-                              /root/GetSetMemberWithInlineKeyword.fs (3,20--3,23)
+                              /root/GetSetMemberWithInlineKeyword.fs (4,20--4,23)
                            AndKeyword =
                             Some
-                              /root/GetSetMemberWithInlineKeyword.fs (4,8--4,11)
+                              /root/GetSetMemberWithInlineKeyword.fs (5,8--5,11)
                            SetKeyword =
                             Some
-                              /root/GetSetMemberWithInlineKeyword.fs (4,19--4,22) })],
-                     /root/GetSetMemberWithInlineKeyword.fs (2,4--4,29)), [],
-                  None, /root/GetSetMemberWithInlineKeyword.fs (1,5--4,29),
+                              /root/GetSetMemberWithInlineKeyword.fs (5,19--5,22) })],
+                     /root/GetSetMemberWithInlineKeyword.fs (3,4--5,29)), [],
+                  None, /root/GetSetMemberWithInlineKeyword.fs (2,5--5,29),
                   { LeadingKeyword =
-                     Type /root/GetSetMemberWithInlineKeyword.fs (1,0--1,4)
+                     Type /root/GetSetMemberWithInlineKeyword.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/GetSetMemberWithInlineKeyword.fs (1,7--1,8)
+                     Some /root/GetSetMemberWithInlineKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/GetSetMemberWithInlineKeyword.fs (1,0--4,29))],
+              /root/GetSetMemberWithInlineKeyword.fs (2,0--5,29))],
           PreXmlDocEmpty, [], None,
-          /root/GetSetMemberWithInlineKeyword.fs (1,0--4,29),
+          /root/GetSetMemberWithInlineKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs b/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs
index 348fdc3ad76..9bebb525e73 100644
--- a/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs
+++ b/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs
@@ -1,3 +1,4 @@
+
 namespace Ionide.VSCode.FSharp
 
-open global.Node
\ No newline at end of file
+open global.Node
diff --git a/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs.bsl b/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs.bsl
index 3d65f430cc3..bcaf022e4de 100644
--- a/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs.bsl
@@ -8,13 +8,13 @@ ImplFile
              (ModuleOrNamespace
                 (SynLongIdent
                    ([`global`; Node],
-                    [/root/GlobalInOpenPathShouldContainTrivia.fs (3,11--3,12)],
+                    [/root/GlobalInOpenPathShouldContainTrivia.fs (4,11--4,12)],
                     [Some (OriginalNotation "global"); None]),
-                 /root/GlobalInOpenPathShouldContainTrivia.fs (3,5--3,16)),
-              /root/GlobalInOpenPathShouldContainTrivia.fs (3,0--3,16))],
+                 /root/GlobalInOpenPathShouldContainTrivia.fs (4,5--4,16)),
+              /root/GlobalInOpenPathShouldContainTrivia.fs (4,0--4,16))],
           PreXmlDocEmpty, [], None,
-          /root/GlobalInOpenPathShouldContainTrivia.fs (1,0--3,16),
+          /root/GlobalInOpenPathShouldContainTrivia.fs (2,0--4,16),
           { LeadingKeyword =
-             Namespace /root/GlobalInOpenPathShouldContainTrivia.fs (1,0--1,9) })],
+             Namespace /root/GlobalInOpenPathShouldContainTrivia.fs (2,0--2,9) })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs b/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs
index f0de9aeb328..aebe237a77f 100644
--- a/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs
+++ b/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs
@@ -1 +1,2 @@
-global
\ No newline at end of file
+
+global
diff --git a/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs.bsl b/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs.bsl
index ed2e6af2cea..b1556be8c4c 100644
--- a/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs.bsl
+++ b/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs.bsl
@@ -9,9 +9,9 @@ ImplFile
                 (false,
                  SynLongIdent
                    ([`global`], [], [Some (OriginalNotation "global")]), None,
-                 /root/GlobalKeywordAsSynExpr.fs (1,0--1,6)),
-              /root/GlobalKeywordAsSynExpr.fs (1,0--1,6))], PreXmlDocEmpty, [],
-          None, /root/GlobalKeywordAsSynExpr.fs (1,0--1,6),
+                 /root/GlobalKeywordAsSynExpr.fs (2,0--2,6)),
+              /root/GlobalKeywordAsSynExpr.fs (2,0--2,6))], PreXmlDocEmpty, [],
+          None, /root/GlobalKeywordAsSynExpr.fs (2,0--2,6),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs
index cbfb033f2c2..ec44a458d0f 100644
--- a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs
+++ b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs
@@ -1,5 +1,6 @@
+
 // foo
 // bar
 namespace  global
 
-type X = int
\ No newline at end of file
+type X = int
diff --git a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
index 30cff3e7bb0..a2db2ab3cef 100644
--- a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
@@ -8,34 +8,34 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((6,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,5--5,6)),
+                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,5--6,6)),
                   Simple
                     (TypeAbbrev
                        (Ok, LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,9--5,12)),
-                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,9--5,12)),
+                        /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,9--6,12)),
+                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,9--6,12)),
                   [], None,
-                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,5--5,12),
+                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,5--6,12),
                   { LeadingKeyword =
                      Type
-                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,0--5,4)
+                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,0--6,4)
                     EqualsRange =
                      Some
-                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,7--5,8)
+                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,7--6,8)
                     WithKeyword = None })],
-              /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (5,0--5,12))],
+              /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,0--6,12))],
           PreXmlDocEmpty, [], None,
-          /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (3,0--5,12),
+          /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (4,0--6,12),
           { LeadingKeyword =
              Namespace
-               /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (3,0--3,9) })],
+               /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (4,0--4,9) })],
       (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (1,0--1,6);
+            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (2,0--2,6);
           LineComment
-            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (2,0--2,6)] },
+            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (3,0--3,6)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi
index 1a1ea1279f4..5b5c1a377e6 100644
--- a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi
+++ b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi
@@ -1,5 +1,6 @@
+
 // foo
 // bar
 namespace  global
 
-type Bar = | Bar of string * int
\ No newline at end of file
+type Bar = | Bar of string * int
diff --git a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
index 26bcc26b5a8..8ebc1b89201 100644
--- a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
@@ -8,9 +8,9 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Bar],
-                     PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((6,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,5--5,8)),
+                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,5--6,8)),
                   Simple
                     (Union
                        (None,
@@ -21,45 +21,45 @@ SigFile
                                  ([], false, None,
                                   LongIdent
                                     (SynLongIdent ([string], [], [None])), false,
-                                  PreXmlDoc ((5,20), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((6,20), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,20--5,26),
+                                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,20--6,26),
                                   { LeadingKeyword = None });
                                SynField
                                  ([], false, None,
                                   LongIdent (SynLongIdent ([int], [], [None])),
                                   false,
-                                  PreXmlDoc ((5,29), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((6,29), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,29--5,32),
+                                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,29--6,32),
                                   { LeadingKeyword = None })],
-                            PreXmlDoc ((5,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((6,11), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,13--5,32),
+                            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,13--6,32),
                             { BarRange =
                                Some
-                                 /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,11--5,12) })],
-                        /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,11--5,32)),
-                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,11--5,32)),
+                                 /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,11--6,12) })],
+                        /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,11--6,32)),
+                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,11--6,32)),
                   [],
-                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,5--5,32),
+                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,5--6,32),
                   { LeadingKeyword =
                      Type
-                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,0--5,4)
+                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,0--6,4)
                     EqualsRange =
                      Some
-                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,9--5,10)
+                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,9--6,10)
                     WithKeyword = None })],
-              /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (5,0--5,32))],
+              /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,0--6,32))],
           PreXmlDocEmpty, [], None,
-          /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (3,0--5,32),
+          /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (4,0--6,32),
           { LeadingKeyword =
              Namespace
-               /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (3,0--3,9) })],
+               /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (4,0--4,9) })],
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (1,0--1,6);
+            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (2,0--2,6);
           LineComment
-            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (2,0--2,6)] },
+            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (3,0--3,6)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs b/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs
index 9264646b7c3..07895f7f1bd 100644
--- a/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs
+++ b/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs
@@ -1,3 +1,4 @@
+
 if a
 then b
-else c
\ No newline at end of file
+else c
diff --git a/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs.bsl b/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs.bsl
index 60e1e31b39c..b50fad05999 100644
--- a/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs.bsl
+++ b/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs.bsl
@@ -7,21 +7,21 @@ ImplFile
           [Expr
              (IfThenElse
                 (Ident a, Ident b, Some (Ident c),
-                 Yes /root/If,ThenAndElseKeywordOnSeparateLines.fs (1,0--2,4),
-                 false, /root/If,ThenAndElseKeywordOnSeparateLines.fs (1,0--3,6),
+                 Yes /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--3,4),
+                 false, /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--4,6),
                  { IfKeyword =
-                    /root/If,ThenAndElseKeywordOnSeparateLines.fs (1,0--1,2)
+                    /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--2,2)
                    IsElif = false
                    ThenKeyword =
-                    /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--2,4)
+                    /root/If,ThenAndElseKeywordOnSeparateLines.fs (3,0--3,4)
                    ElseKeyword =
                     Some
-                      /root/If,ThenAndElseKeywordOnSeparateLines.fs (3,0--3,4)
+                      /root/If,ThenAndElseKeywordOnSeparateLines.fs (4,0--4,4)
                    IfToThenRange =
-                    /root/If,ThenAndElseKeywordOnSeparateLines.fs (1,0--2,4) }),
-              /root/If,ThenAndElseKeywordOnSeparateLines.fs (1,0--3,6))],
+                    /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--3,4) }),
+              /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--4,6))],
           PreXmlDocEmpty, [], None,
-          /root/If,ThenAndElseKeywordOnSeparateLines.fs (1,0--3,6),
+          /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs b/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs
index d6b90e2e736..c45e53028cc 100644
--- a/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs
+++ b/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs
@@ -1 +1,2 @@
-if a then b
\ No newline at end of file
+
+if a then b
diff --git a/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs.bsl
index 3a787ec2ec4..3928f27cd88 100644
--- a/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs.bsl
+++ b/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs.bsl
@@ -7,15 +7,15 @@ ImplFile
           [Expr
              (IfThenElse
                 (Ident a, Ident b, None,
-                 Yes /root/IfKeywordInIfThenElse.fs (1,0--1,9), false,
-                 /root/IfKeywordInIfThenElse.fs (1,0--1,11),
-                 { IfKeyword = /root/IfKeywordInIfThenElse.fs (1,0--1,2)
+                 Yes /root/IfKeywordInIfThenElse.fs (2,0--2,9), false,
+                 /root/IfKeywordInIfThenElse.fs (2,0--2,11),
+                 { IfKeyword = /root/IfKeywordInIfThenElse.fs (2,0--2,2)
                    IsElif = false
-                   ThenKeyword = /root/IfKeywordInIfThenElse.fs (1,5--1,9)
+                   ThenKeyword = /root/IfKeywordInIfThenElse.fs (2,5--2,9)
                    ElseKeyword = None
-                   IfToThenRange = /root/IfKeywordInIfThenElse.fs (1,0--1,9) }),
-              /root/IfKeywordInIfThenElse.fs (1,0--1,11))], PreXmlDocEmpty, [],
-          None, /root/IfKeywordInIfThenElse.fs (1,0--1,11),
+                   IfToThenRange = /root/IfKeywordInIfThenElse.fs (2,0--2,9) }),
+              /root/IfKeywordInIfThenElse.fs (2,0--2,11))], PreXmlDocEmpty, [],
+          None, /root/IfKeywordInIfThenElse.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs b/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs
index 3a4e16c0b69..5665be1862b 100644
--- a/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs
+++ b/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs
@@ -1,7 +1,8 @@
+
 type internal CompilerStateCache(readAllBytes: string -> byte[], projectOptions: FSharpProjectOptions)
 //#if !NO_TYPEPROVIDERS
     as this =
 //#else
 //     =
 // #endif
-    class end
\ No newline at end of file
+    class end
diff --git a/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs.bsl b/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs.bsl
index cb0a62f30ce..b9bdfa35c56 100644
--- a/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs.bsl
@@ -8,11 +8,11 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [CompilerStateCache],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false,
                      Some
-                       (Internal /root/ImplicitCtorWithAsKeyword.fs (1,5--1,13)),
-                     /root/ImplicitCtorWithAsKeyword.fs (1,14--1,32)),
+                       (Internal /root/ImplicitCtorWithAsKeyword.fs (2,5--2,13)),
+                     /root/ImplicitCtorWithAsKeyword.fs (2,14--2,32)),
                   ObjectModel
                     (Class,
                      [ImplicitCtor
@@ -21,7 +21,7 @@ ImplFile
                            ([Typed
                                (Id
                                   (readAllBytes, None, false, false, false,
-                                   /root/ImplicitCtorWithAsKeyword.fs (1,33--1,45)),
+                                   /root/ImplicitCtorWithAsKeyword.fs (2,33--2,45)),
                                 Fun
                                   (LongIdent
                                      (SynLongIdent ([string], [], [None])),
@@ -29,26 +29,26 @@ ImplFile
                                      (1,
                                       LongIdent
                                         (SynLongIdent ([byte], [], [None])),
-                                      /root/ImplicitCtorWithAsKeyword.fs (1,57--1,63)),
-                                   /root/ImplicitCtorWithAsKeyword.fs (1,47--1,63),
+                                      /root/ImplicitCtorWithAsKeyword.fs (2,57--2,63)),
+                                   /root/ImplicitCtorWithAsKeyword.fs (2,47--2,63),
                                    { ArrowRange =
-                                      /root/ImplicitCtorWithAsKeyword.fs (1,54--1,56) }),
-                                /root/ImplicitCtorWithAsKeyword.fs (1,33--1,63));
+                                      /root/ImplicitCtorWithAsKeyword.fs (2,54--2,56) }),
+                                /root/ImplicitCtorWithAsKeyword.fs (2,33--2,63));
                              Typed
                                (Id
                                   (projectOptions, None, false, false, false,
-                                   /root/ImplicitCtorWithAsKeyword.fs (1,65--1,79)),
+                                   /root/ImplicitCtorWithAsKeyword.fs (2,65--2,79)),
                                 LongIdent
                                   (SynLongIdent
                                      ([FSharpProjectOptions], [], [None])),
-                                /root/ImplicitCtorWithAsKeyword.fs (1,65--1,101))],
-                            /root/ImplicitCtorWithAsKeyword.fs (1,32--1,102)),
+                                /root/ImplicitCtorWithAsKeyword.fs (2,65--2,101))],
+                            /root/ImplicitCtorWithAsKeyword.fs (2,32--2,102)),
                          Some this,
-                         PreXmlDoc ((1,32), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/ImplicitCtorWithAsKeyword.fs (1,14--1,32),
+                         PreXmlDoc ((2,32), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/ImplicitCtorWithAsKeyword.fs (2,14--2,32),
                          { AsKeyword =
-                            Some /root/ImplicitCtorWithAsKeyword.fs (3,4--3,6) })],
-                     /root/ImplicitCtorWithAsKeyword.fs (7,4--7,13)), [],
+                            Some /root/ImplicitCtorWithAsKeyword.fs (4,4--4,6) })],
+                     /root/ImplicitCtorWithAsKeyword.fs (8,4--8,13)), [],
                   Some
                     (ImplicitCtor
                        (None, [],
@@ -56,7 +56,7 @@ ImplFile
                           ([Typed
                               (Id
                                  (readAllBytes, None, false, false, false,
-                                  /root/ImplicitCtorWithAsKeyword.fs (1,33--1,45)),
+                                  /root/ImplicitCtorWithAsKeyword.fs (2,33--2,45)),
                                Fun
                                  (LongIdent
                                     (SynLongIdent ([string], [], [None])),
@@ -64,37 +64,37 @@ ImplFile
                                     (1,
                                      LongIdent
                                        (SynLongIdent ([byte], [], [None])),
-                                     /root/ImplicitCtorWithAsKeyword.fs (1,57--1,63)),
-                                  /root/ImplicitCtorWithAsKeyword.fs (1,47--1,63),
+                                     /root/ImplicitCtorWithAsKeyword.fs (2,57--2,63)),
+                                  /root/ImplicitCtorWithAsKeyword.fs (2,47--2,63),
                                   { ArrowRange =
-                                     /root/ImplicitCtorWithAsKeyword.fs (1,54--1,56) }),
-                               /root/ImplicitCtorWithAsKeyword.fs (1,33--1,63));
+                                     /root/ImplicitCtorWithAsKeyword.fs (2,54--2,56) }),
+                               /root/ImplicitCtorWithAsKeyword.fs (2,33--2,63));
                             Typed
                               (Id
                                  (projectOptions, None, false, false, false,
-                                  /root/ImplicitCtorWithAsKeyword.fs (1,65--1,79)),
+                                  /root/ImplicitCtorWithAsKeyword.fs (2,65--2,79)),
                                LongIdent
                                  (SynLongIdent
                                     ([FSharpProjectOptions], [], [None])),
-                               /root/ImplicitCtorWithAsKeyword.fs (1,65--1,101))],
-                           /root/ImplicitCtorWithAsKeyword.fs (1,32--1,102)),
+                               /root/ImplicitCtorWithAsKeyword.fs (2,65--2,101))],
+                           /root/ImplicitCtorWithAsKeyword.fs (2,32--2,102)),
                         Some this,
-                        PreXmlDoc ((1,32), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/ImplicitCtorWithAsKeyword.fs (1,14--1,32),
+                        PreXmlDoc ((2,32), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/ImplicitCtorWithAsKeyword.fs (2,14--2,32),
                         { AsKeyword =
-                           Some /root/ImplicitCtorWithAsKeyword.fs (3,4--3,6) })),
-                  /root/ImplicitCtorWithAsKeyword.fs (1,5--7,13),
+                           Some /root/ImplicitCtorWithAsKeyword.fs (4,4--4,6) })),
+                  /root/ImplicitCtorWithAsKeyword.fs (2,5--8,13),
                   { LeadingKeyword =
-                     Type /root/ImplicitCtorWithAsKeyword.fs (1,0--1,4)
+                     Type /root/ImplicitCtorWithAsKeyword.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/ImplicitCtorWithAsKeyword.fs (3,12--3,13)
+                     Some /root/ImplicitCtorWithAsKeyword.fs (4,12--4,13)
                     WithKeyword = None })],
-              /root/ImplicitCtorWithAsKeyword.fs (1,0--7,13))], PreXmlDocEmpty,
-          [], None, /root/ImplicitCtorWithAsKeyword.fs (1,0--7,13),
+              /root/ImplicitCtorWithAsKeyword.fs (2,0--8,13))], PreXmlDocEmpty,
+          [], None, /root/ImplicitCtorWithAsKeyword.fs (2,0--9,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/ImplicitCtorWithAsKeyword.fs (2,0--2,23);
-          LineComment /root/ImplicitCtorWithAsKeyword.fs (4,0--4,7);
-          LineComment /root/ImplicitCtorWithAsKeyword.fs (5,0--5,8);
-          LineComment /root/ImplicitCtorWithAsKeyword.fs (6,0--6,9)] }, set []))
\ No newline at end of file
+         [LineComment /root/ImplicitCtorWithAsKeyword.fs (3,0--3,23);
+          LineComment /root/ImplicitCtorWithAsKeyword.fs (5,0--5,7);
+          LineComment /root/ImplicitCtorWithAsKeyword.fs (6,0--6,8);
+          LineComment /root/ImplicitCtorWithAsKeyword.fs (7,0--7,9)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InHeadPattern.fs b/tests/service/data/SyntaxTree/InHeadPattern.fs
index 912685faae4..89afebdfc90 100644
--- a/tests/service/data/SyntaxTree/InHeadPattern.fs
+++ b/tests/service/data/SyntaxTree/InHeadPattern.fs
@@ -1 +1,2 @@
-let 1 :: _ = [ 4; 5; 6 ]
\ No newline at end of file
+
+let 1 :: _ = [ 4; 5; 6 ]
diff --git a/tests/service/data/SyntaxTree/InHeadPattern.fs.bsl b/tests/service/data/SyntaxTree/InHeadPattern.fs.bsl
index 9d06cb7cfe4..b8449bc39f6 100644
--- a/tests/service/data/SyntaxTree/InHeadPattern.fs.bsl
+++ b/tests/service/data/SyntaxTree/InHeadPattern.fs.bsl
@@ -7,33 +7,33 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   ListCons
-                    (Const (Int32 1, /root/InHeadPattern.fs (1,4--1,5)),
-                     Wild /root/InHeadPattern.fs (1,9--1,10),
-                     /root/InHeadPattern.fs (1,4--1,10),
-                     { ColonColonRange = /root/InHeadPattern.fs (1,6--1,8) }),
+                    (Const (Int32 1, /root/InHeadPattern.fs (2,4--2,5)),
+                     Wild /root/InHeadPattern.fs (2,9--2,10),
+                     /root/InHeadPattern.fs (2,4--2,10),
+                     { ColonColonRange = /root/InHeadPattern.fs (2,6--2,8) }),
                   None,
                   ArrayOrListComputed
                     (false,
                      Sequential
                        (SuppressNeither, true,
-                        Const (Int32 4, /root/InHeadPattern.fs (1,15--1,16)),
+                        Const (Int32 4, /root/InHeadPattern.fs (2,15--2,16)),
                         Sequential
                           (SuppressNeither, true,
-                           Const (Int32 5, /root/InHeadPattern.fs (1,18--1,19)),
-                           Const (Int32 6, /root/InHeadPattern.fs (1,21--1,22)),
-                           /root/InHeadPattern.fs (1,18--1,22)),
-                        /root/InHeadPattern.fs (1,15--1,22)),
-                     /root/InHeadPattern.fs (1,13--1,24)),
-                  /root/InHeadPattern.fs (1,4--1,10),
-                  Yes /root/InHeadPattern.fs (1,0--1,24),
-                  { LeadingKeyword = Let /root/InHeadPattern.fs (1,0--1,3)
+                           Const (Int32 5, /root/InHeadPattern.fs (2,18--2,19)),
+                           Const (Int32 6, /root/InHeadPattern.fs (2,21--2,22)),
+                           /root/InHeadPattern.fs (2,18--2,22)),
+                        /root/InHeadPattern.fs (2,15--2,22)),
+                     /root/InHeadPattern.fs (2,13--2,24)),
+                  /root/InHeadPattern.fs (2,4--2,10),
+                  Yes /root/InHeadPattern.fs (2,0--2,24),
+                  { LeadingKeyword = Let /root/InHeadPattern.fs (2,0--2,3)
                     InlineKeyword = None
-                    EqualsRange = Some /root/InHeadPattern.fs (1,11--1,12) })],
-              /root/InHeadPattern.fs (1,0--1,24))], PreXmlDocEmpty, [], None,
-          /root/InHeadPattern.fs (1,0--1,24), { LeadingKeyword = None })],
+                    EqualsRange = Some /root/InHeadPattern.fs (2,11--2,12) })],
+              /root/InHeadPattern.fs (2,0--2,24))], PreXmlDocEmpty, [], None,
+          /root/InHeadPattern.fs (2,0--3,0), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/IncompleteLongIdent.fs b/tests/service/data/SyntaxTree/IncompleteLongIdent.fs
index a7a516155bb..5b420cfa85e 100644
--- a/tests/service/data/SyntaxTree/IncompleteLongIdent.fs
+++ b/tests/service/data/SyntaxTree/IncompleteLongIdent.fs
@@ -1,3 +1,4 @@
+
 module Module
 
-A.
\ No newline at end of file
+A.
diff --git a/tests/service/data/SyntaxTree/IncompleteLongIdent.fs.bsl b/tests/service/data/SyntaxTree/IncompleteLongIdent.fs.bsl
index 8839906d344..2467b626f3d 100644
--- a/tests/service/data/SyntaxTree/IncompleteLongIdent.fs.bsl
+++ b/tests/service/data/SyntaxTree/IncompleteLongIdent.fs.bsl
@@ -7,11 +7,11 @@ ImplFile
              (LongIdent
                 (false,
                  SynLongIdent
-                   ([A], [/root/IncompleteLongIdent.fs (3,1--3,2)], [None]),
-                 None, /root/IncompleteLongIdent.fs (3,0--3,2)),
-              /root/IncompleteLongIdent.fs (3,0--3,2))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/IncompleteLongIdent.fs (1,0--3,2),
-          { LeadingKeyword = Module /root/IncompleteLongIdent.fs (1,0--1,6) })],
+                   ([A], [/root/IncompleteLongIdent.fs (4,1--4,2)], [None]),
+                 None, /root/IncompleteLongIdent.fs (4,0--4,2)),
+              /root/IncompleteLongIdent.fs (4,0--4,2))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/IncompleteLongIdent.fs (2,0--4,2),
+          { LeadingKeyword = Module /root/IncompleteLongIdent.fs (2,0--2,6) })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InfixOperation.fs b/tests/service/data/SyntaxTree/InfixOperation.fs
index 1a5a117eb38..d7612d1973e 100644
--- a/tests/service/data/SyntaxTree/InfixOperation.fs
+++ b/tests/service/data/SyntaxTree/InfixOperation.fs
@@ -1 +1,2 @@
-1 + 1
\ No newline at end of file
+
+1 + 1
diff --git a/tests/service/data/SyntaxTree/InfixOperation.fs.bsl b/tests/service/data/SyntaxTree/InfixOperation.fs.bsl
index 1a398f2d0f2..8e400070d47 100644
--- a/tests/service/data/SyntaxTree/InfixOperation.fs.bsl
+++ b/tests/service/data/SyntaxTree/InfixOperation.fs.bsl
@@ -13,12 +13,12 @@ ImplFile
                       (false,
                        SynLongIdent
                          ([op_Addition], [], [Some (OriginalNotation "+")]),
-                       None, /root/InfixOperation.fs (1,2--1,3)),
-                    Const (Int32 1, /root/InfixOperation.fs (1,0--1,1)),
-                    /root/InfixOperation.fs (1,0--1,3)),
-                 Const (Int32 1, /root/InfixOperation.fs (1,4--1,5)),
-                 /root/InfixOperation.fs (1,0--1,5)),
-              /root/InfixOperation.fs (1,0--1,5))], PreXmlDocEmpty, [], None,
-          /root/InfixOperation.fs (1,0--1,5), { LeadingKeyword = None })],
+                       None, /root/InfixOperation.fs (2,2--2,3)),
+                    Const (Int32 1, /root/InfixOperation.fs (2,0--2,1)),
+                    /root/InfixOperation.fs (2,0--2,3)),
+                 Const (Int32 1, /root/InfixOperation.fs (2,4--2,5)),
+                 /root/InfixOperation.fs (2,0--2,5)),
+              /root/InfixOperation.fs (2,0--2,5))], PreXmlDocEmpty, [], None,
+          /root/InfixOperation.fs (2,0--2,5), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs b/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
index 9b50201463d..052ae41c0e4 100644
--- a/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
+++ b/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
@@ -1 +1,2 @@
-{ inherit Exception(msg); X = 1; }
\ No newline at end of file
+
+{ inherit Exception(msg); X = 1; }
diff --git a/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
index 3fc30030af6..93f8e073b73 100644
--- a/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
+++ b/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
@@ -14,31 +14,31 @@ ImplFile
                    (LongIdent (SynLongIdent ([Exception], [], [None])),
                     Paren
                       (Ident msg,
-                       /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,19--1,20),
+                       /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,19--2,20),
                        Some
-                         /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,23--1,24),
-                       /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,19--1,24)),
-                    /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,10--1,24),
+                         /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,23--2,24),
+                       /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,19--2,24)),
+                    /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,10--2,24),
                     Some
-                      (/root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,24--1,25),
-                       Some (1,25)),
-                    /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,2--1,9)),
+                      (/root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,24--2,25),
+                       Some (2,25)),
+                    /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,2--2,9)),
                  None,
                  [SynExprRecordField
                     ((SynLongIdent ([X], [], [None]), true),
                      Some
-                       /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,28--1,29),
+                       /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,28--2,29),
                      Some
                        (Const
                           (Int32 1,
-                           /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,30--1,31))),
+                           /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,30--2,31))),
                      Some
-                       (/root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,31--1,32),
-                        Some (1,32)))],
-                 /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--1,34)),
-              /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--1,34))],
+                       (/root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,31--2,32),
+                        Some (2,32)))],
+                 /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--2,34)),
+              /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--2,34))],
           PreXmlDocEmpty, [], None,
-          /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--1,34),
+          /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--2,34),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InlineKeyword.fsi b/tests/service/data/SyntaxTree/InlineKeyword.fsi
index 477a4bc4072..0d84e96d179 100644
--- a/tests/service/data/SyntaxTree/InlineKeyword.fsi
+++ b/tests/service/data/SyntaxTree/InlineKeyword.fsi
@@ -1,3 +1,4 @@
+
 namespace X
 
-val inline meh: int -> int
\ No newline at end of file
+val inline meh: int -> int
diff --git a/tests/service/data/SyntaxTree/InlineKeyword.fsi.bsl b/tests/service/data/SyntaxTree/InlineKeyword.fsi.bsl
index 6f1bc276ec3..0d6932ecdec 100644
--- a/tests/service/data/SyntaxTree/InlineKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/InlineKeyword.fsi.bsl
@@ -9,18 +9,18 @@ SigFile
                  Fun
                    (LongIdent (SynLongIdent ([int], [], [None])),
                     LongIdent (SynLongIdent ([int], [], [None])),
-                    /root/InlineKeyword.fsi (3,16--3,26),
-                    { ArrowRange = /root/InlineKeyword.fsi (3,20--3,22) }),
+                    /root/InlineKeyword.fsi (4,16--4,26),
+                    { ArrowRange = /root/InlineKeyword.fsi (4,20--4,22) }),
                  SynValInfo
                    ([[SynArgInfo ([], false, None)]],
                     SynArgInfo ([], false, None)), true, false,
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 None, /root/InlineKeyword.fsi (3,0--3,26),
-                 { LeadingKeyword = Val /root/InlineKeyword.fsi (3,0--3,3)
-                   InlineKeyword = Some /root/InlineKeyword.fsi (3,4--3,10)
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None, /root/InlineKeyword.fsi (4,0--4,26),
+                 { LeadingKeyword = Val /root/InlineKeyword.fsi (4,0--4,3)
+                   InlineKeyword = Some /root/InlineKeyword.fsi (4,4--4,10)
                    WithKeyword = None
-                   EqualsRange = None }), /root/InlineKeyword.fsi (3,0--3,26))],
-          PreXmlDocEmpty, [], None, /root/InlineKeyword.fsi (1,0--3,26),
-          { LeadingKeyword = Namespace /root/InlineKeyword.fsi (1,0--1,9) })],
+                   EqualsRange = None }), /root/InlineKeyword.fsi (4,0--4,26))],
+          PreXmlDocEmpty, [], None, /root/InlineKeyword.fsi (2,0--4,26),
+          { LeadingKeyword = Namespace /root/InlineKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs b/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs
index 7d93bcd1208..449f25de54d 100644
--- a/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs
+++ b/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs
@@ -1,3 +1,4 @@
+
 let inline x y z =
     let inline a b c = ()
-    ()
\ No newline at end of file
+    ()
diff --git a/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs.bsl b/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs.bsl
index a2f87847770..f92d8973960 100644
--- a/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, true, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -20,16 +20,16 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (y, None), false, None,
-                           /root/InlineKeywordInBinding.fs (1,13--1,14));
+                           /root/InlineKeywordInBinding.fs (2,13--2,14));
                         Named
                           (SynIdent (z, None), false, None,
-                           /root/InlineKeywordInBinding.fs (1,15--1,16))], None,
-                     /root/InlineKeywordInBinding.fs (1,11--1,16)), None,
+                           /root/InlineKeywordInBinding.fs (2,15--2,16))], None,
+                     /root/InlineKeywordInBinding.fs (2,11--2,16)), None,
                   LetOrUse
                     (false, false,
                      [SynBinding
                         (None, Normal, true, false, [],
-                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          SynValData
                            (None,
                             SynValInfo
@@ -41,33 +41,33 @@ ImplFile
                             Pats
                               [Named
                                  (SynIdent (b, None), false, None,
-                                  /root/InlineKeywordInBinding.fs (2,17--2,18));
+                                  /root/InlineKeywordInBinding.fs (3,17--3,18));
                                Named
                                  (SynIdent (c, None), false, None,
-                                  /root/InlineKeywordInBinding.fs (2,19--2,20))],
-                            None, /root/InlineKeywordInBinding.fs (2,15--2,20)),
+                                  /root/InlineKeywordInBinding.fs (3,19--3,20))],
+                            None, /root/InlineKeywordInBinding.fs (3,15--3,20)),
                          None,
                          Const
-                           (Unit, /root/InlineKeywordInBinding.fs (2,23--2,25)),
-                         /root/InlineKeywordInBinding.fs (2,15--2,20), NoneAtLet,
+                           (Unit, /root/InlineKeywordInBinding.fs (3,23--3,25)),
+                         /root/InlineKeywordInBinding.fs (3,15--3,20), NoneAtLet,
                          { LeadingKeyword =
-                            Let /root/InlineKeywordInBinding.fs (2,4--2,7)
+                            Let /root/InlineKeywordInBinding.fs (3,4--3,7)
                            InlineKeyword =
-                            Some /root/InlineKeywordInBinding.fs (2,8--2,14)
+                            Some /root/InlineKeywordInBinding.fs (3,8--3,14)
                            EqualsRange =
-                            Some /root/InlineKeywordInBinding.fs (2,21--2,22) })],
-                     Const (Unit, /root/InlineKeywordInBinding.fs (3,4--3,6)),
-                     /root/InlineKeywordInBinding.fs (2,4--3,6),
+                            Some /root/InlineKeywordInBinding.fs (3,21--3,22) })],
+                     Const (Unit, /root/InlineKeywordInBinding.fs (4,4--4,6)),
+                     /root/InlineKeywordInBinding.fs (3,4--4,6),
                      { InKeyword = None }),
-                  /root/InlineKeywordInBinding.fs (1,11--1,16), NoneAtLet,
+                  /root/InlineKeywordInBinding.fs (2,11--2,16), NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/InlineKeywordInBinding.fs (1,0--1,3)
+                     Let /root/InlineKeywordInBinding.fs (2,0--2,3)
                     InlineKeyword =
-                     Some /root/InlineKeywordInBinding.fs (1,4--1,10)
+                     Some /root/InlineKeywordInBinding.fs (2,4--2,10)
                     EqualsRange =
-                     Some /root/InlineKeywordInBinding.fs (1,17--1,18) })],
-              /root/InlineKeywordInBinding.fs (1,0--3,6))], PreXmlDocEmpty, [],
-          None, /root/InlineKeywordInBinding.fs (1,0--3,6),
+                     Some /root/InlineKeywordInBinding.fs (2,17--2,18) })],
+              /root/InlineKeywordInBinding.fs (2,0--4,6))], PreXmlDocEmpty, [],
+          None, /root/InlineKeywordInBinding.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs b/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs
index c351705c399..56939e2a722 100644
--- a/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs
+++ b/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs
@@ -1 +1,2 @@
-fun a (b, _) c -> x
\ No newline at end of file
+
+fun a (b, _) c -> x
diff --git a/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
index 19060875455..3ce6336d488 100644
--- a/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
+++ b/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
@@ -12,60 +12,60 @@ ImplFile
                  SimplePats
                    ([Id
                        (a, None, false, false, false,
-                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,4--1,5))],
-                    /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,4--1,5)),
+                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,4--2,5))],
+                    /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,4--2,5)),
                  Lambda
                    (false, true,
                     SimplePats
                       ([Id
                           (b, None, false, false, false,
-                           /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,7--1,8));
+                           /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,7--2,8));
                         Id
                           (_arg1, None, true, false, false,
-                           /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,10--1,11))],
-                       /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,6--1,12)),
+                           /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,10--2,11))],
+                       /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,6--2,12)),
                     Lambda
                       (false, true,
                        SimplePats
                          ([Id
                              (c, None, false, false, false,
-                              /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,13--1,14))],
-                          /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,13--1,14)),
+                              /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,13--2,14))],
+                          /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,13--2,14)),
                        Ident x, None,
-                       /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,0--1,19),
+                       /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--2,19),
                        { ArrowRange =
                           Some
-                            /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,15--1,17) }),
+                            /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,15--2,17) }),
                     None,
-                    /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,0--1,19),
+                    /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--2,19),
                     { ArrowRange =
                        Some
-                         /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,15--1,17) }),
+                         /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,15--2,17) }),
                  Some
                    ([Named
                        (SynIdent (a, None), false, None,
-                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,4--1,5));
+                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,4--2,5));
                      Paren
                        (Tuple
                           (false,
                            [Named
                               (SynIdent (b, None), false, None,
-                               /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,7--1,8));
+                               /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,7--2,8));
                             Wild
-                              /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,10--1,11)],
-                           /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,7--1,11)),
-                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,6--1,12));
+                              /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,10--2,11)],
+                           /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,7--2,11)),
+                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,6--2,12));
                      Named
                        (SynIdent (c, None), false, None,
-                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,13--1,14))],
+                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,13--2,14))],
                     Ident x),
-                 /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,0--1,19),
+                 /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--2,19),
                  { ArrowRange =
                     Some
-                      /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,15--1,17) }),
-              /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,0--1,19))],
+                      /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,15--2,17) }),
+              /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--2,19))],
           PreXmlDocEmpty, [], None,
-          /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (1,0--1,19),
+          /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs b/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs
index 1570867ed82..3649d2412ff 100644
--- a/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs
+++ b/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs
@@ -1 +1,2 @@
-fun a b -> x
\ No newline at end of file
+
+fun a b -> x
diff --git a/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
index 823c77c77ce..df21d31cf02 100644
--- a/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
+++ b/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
@@ -10,35 +10,35 @@ ImplFile
                  SimplePats
                    ([Id
                        (a, None, false, false, false,
-                        /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,4--1,5))],
-                    /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,4--1,5)),
+                        /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,4--2,5))],
+                    /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,4--2,5)),
                  Lambda
                    (false, true,
                     SimplePats
                       ([Id
                           (b, None, false, false, false,
-                           /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,6--1,7))],
-                       /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,6--1,7)),
+                           /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,6--2,7))],
+                       /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,6--2,7)),
                     Ident x, None,
-                    /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,0--1,12),
+                    /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,0--2,12),
                     { ArrowRange =
                        Some
-                         /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,8--1,10) }),
+                         /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,8--2,10) }),
                  Some
                    ([Named
                        (SynIdent (a, None), false, None,
-                        /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,4--1,5));
+                        /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,4--2,5));
                      Named
                        (SynIdent (b, None), false, None,
-                        /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,6--1,7))],
+                        /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,6--2,7))],
                     Ident x),
-                 /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,0--1,12),
+                 /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,0--2,12),
                  { ArrowRange =
                     Some
-                      /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,8--1,10) }),
-              /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,0--1,12))],
+                      /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,8--2,10) }),
+              /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,0--2,12))],
           PreXmlDocEmpty, [], None,
-          /root/LambdaWithTwoParametersGivesCorrectBody.fs (1,0--1,12),
+          /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs b/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs
index 6d534022377..d1701622d03 100644
--- a/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs
+++ b/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs
@@ -1 +1,2 @@
-fun a _ b -> x
\ No newline at end of file
+
+fun a _ b -> x
diff --git a/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
index f9751a7005e..4d47ea40bc2 100644
--- a/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
+++ b/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
@@ -10,49 +10,49 @@ ImplFile
                  SimplePats
                    ([Id
                        (a, None, false, false, false,
-                        /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,4--1,5))],
-                    /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,4--1,5)),
+                        /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,4--2,5))],
+                    /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,4--2,5)),
                  Lambda
                    (false, true,
                     SimplePats
                       ([Id
                           (_arg1, None, true, false, false,
-                           /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,6--1,7))],
-                       /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,6--1,7)),
+                           /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,6--2,7))],
+                       /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,6--2,7)),
                     Lambda
                       (false, true,
                        SimplePats
                          ([Id
                              (b, None, false, false, false,
-                              /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,8--1,9))],
-                          /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,8--1,9)),
+                              /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,8--2,9))],
+                          /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,8--2,9)),
                        Ident x, None,
-                       /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,0--1,14),
+                       /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--2,14),
                        { ArrowRange =
                           Some
-                            /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,10--1,12) }),
+                            /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,10--2,12) }),
                     None,
-                    /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,0--1,14),
+                    /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--2,14),
                     { ArrowRange =
                        Some
-                         /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,10--1,12) }),
+                         /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,10--2,12) }),
                  Some
                    ([Named
                        (SynIdent (a, None), false, None,
-                        /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,4--1,5));
+                        /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,4--2,5));
                      Wild
-                       /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,6--1,7);
+                       /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,6--2,7);
                      Named
                        (SynIdent (b, None), false, None,
-                        /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,8--1,9))],
+                        /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,8--2,9))],
                     Ident x),
-                 /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,0--1,14),
+                 /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--2,14),
                  { ArrowRange =
                     Some
-                      /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,10--1,12) }),
-              /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,0--1,14))],
+                      /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,10--2,12) }),
+              /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--2,14))],
           PreXmlDocEmpty, [], None,
-          /root/LambdaWithWildCardParameterGivesCorrectBody.fs (1,0--1,14),
+          /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs b/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs
index 3266a6b339e..26389628b0a 100644
--- a/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs
+++ b/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs
@@ -1 +1,2 @@
-fun _ -> fun _ -> x
\ No newline at end of file
+
+fun _ -> fun _ -> x
diff --git a/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
index 5e4dd4e1a2a..d349bc2a2ee 100644
--- a/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
+++ b/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
@@ -12,50 +12,50 @@ ImplFile
                  SimplePats
                    ([Id
                        (_arg2, None, true, false, false,
-                        /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,4--1,5))],
-                    /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,4--1,5)),
+                        /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,4--2,5))],
+                    /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,4--2,5)),
                  Lambda
                    (false, false,
                     SimplePats
                       ([Id
                           (_arg1, None, true, false, false,
-                           /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,13--1,14))],
-                       /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,13--1,14)),
+                           /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14))],
+                       /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14)),
                     Ident x,
                     Some
                       ([Wild
-                          /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,13--1,14)],
+                          /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14)],
                        Ident x),
-                    /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,9--1,19),
+                    /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,9--2,19),
                     { ArrowRange =
                        Some
-                         /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,15--1,17) }),
+                         /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,15--2,17) }),
                  Some
                    ([Wild
-                       /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,4--1,5)],
+                       /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,4--2,5)],
                     Lambda
                       (false, false,
                        SimplePats
                          ([Id
                              (_arg1, None, true, false, false,
-                              /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,13--1,14))],
-                          /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,13--1,14)),
+                              /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14))],
+                          /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14)),
                        Ident x,
                        Some
                          ([Wild
-                             /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,13--1,14)],
+                             /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14)],
                           Ident x),
-                       /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,9--1,19),
+                       /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,9--2,19),
                        { ArrowRange =
                           Some
-                            /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,15--1,17) })),
-                 /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,0--1,19),
+                            /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,15--2,17) })),
+                 /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,0--2,19),
                  { ArrowRange =
                     Some
-                      /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,6--1,8) }),
-              /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,0--1,19))],
+                      /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,6--2,8) }),
+              /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,0--2,19))],
           PreXmlDocEmpty, [], None,
-          /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (1,0--1,19),
+          /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi b/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi
index a5f44b1cdc5..65ef6417c9a 100644
--- a/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi
+++ b/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi
@@ -1,2 +1,3 @@
+
 type A = obj
-and B = int
\ No newline at end of file
+and B = int
diff --git a/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi.bsl
index 0057b3052b9..388c7ee0ff4 100644
--- a/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi.bsl
@@ -8,39 +8,39 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [A],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/LeadingKeywordInRecursiveTypes.fsi (1,5--1,6)),
+                     /root/LeadingKeywordInRecursiveTypes.fsi (2,5--2,6)),
                   Simple
                     (TypeAbbrev
                        (Ok, LongIdent (SynLongIdent ([obj], [], [None])),
-                        /root/LeadingKeywordInRecursiveTypes.fsi (1,9--1,12)),
-                     /root/LeadingKeywordInRecursiveTypes.fsi (1,9--1,12)), [],
-                  /root/LeadingKeywordInRecursiveTypes.fsi (1,5--1,12),
+                        /root/LeadingKeywordInRecursiveTypes.fsi (2,9--2,12)),
+                     /root/LeadingKeywordInRecursiveTypes.fsi (2,9--2,12)), [],
+                  /root/LeadingKeywordInRecursiveTypes.fsi (2,5--2,12),
                   { LeadingKeyword =
-                     Type /root/LeadingKeywordInRecursiveTypes.fsi (1,0--1,4)
+                     Type /root/LeadingKeywordInRecursiveTypes.fsi (2,0--2,4)
                     EqualsRange =
-                     Some /root/LeadingKeywordInRecursiveTypes.fsi (1,7--1,8)
+                     Some /root/LeadingKeywordInRecursiveTypes.fsi (2,7--2,8)
                     WithKeyword = None });
                SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [B],
-                     PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/LeadingKeywordInRecursiveTypes.fsi (2,4--2,5)),
+                     /root/LeadingKeywordInRecursiveTypes.fsi (3,4--3,5)),
                   Simple
                     (TypeAbbrev
                        (Ok, LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/LeadingKeywordInRecursiveTypes.fsi (2,8--2,11)),
-                     /root/LeadingKeywordInRecursiveTypes.fsi (2,8--2,11)), [],
-                  /root/LeadingKeywordInRecursiveTypes.fsi (2,4--2,11),
+                        /root/LeadingKeywordInRecursiveTypes.fsi (3,8--3,11)),
+                     /root/LeadingKeywordInRecursiveTypes.fsi (3,8--3,11)), [],
+                  /root/LeadingKeywordInRecursiveTypes.fsi (3,4--3,11),
                   { LeadingKeyword =
-                     And /root/LeadingKeywordInRecursiveTypes.fsi (2,0--2,3)
+                     And /root/LeadingKeywordInRecursiveTypes.fsi (3,0--3,3)
                     EqualsRange =
-                     Some /root/LeadingKeywordInRecursiveTypes.fsi (2,6--2,7)
+                     Some /root/LeadingKeywordInRecursiveTypes.fsi (3,6--3,7)
                     WithKeyword = None })],
-              /root/LeadingKeywordInRecursiveTypes.fsi (1,0--2,11))],
+              /root/LeadingKeywordInRecursiveTypes.fsi (2,0--3,11))],
           PreXmlDocEmpty, [], None,
-          /root/LeadingKeywordInRecursiveTypes.fsi (1,0--2,11),
+          /root/LeadingKeywordInRecursiveTypes.fsi (2,0--4,0),
           { LeadingKeyword = None })], { ConditionalDirectives = []
                                          CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LetKeyword.fs b/tests/service/data/SyntaxTree/LetKeyword.fs
index ce5c6d518b8..1c38d90c379 100644
--- a/tests/service/data/SyntaxTree/LetKeyword.fs
+++ b/tests/service/data/SyntaxTree/LetKeyword.fs
@@ -1 +1,2 @@
-let a b = b + 1
\ No newline at end of file
+
+let a b = b + 1
diff --git a/tests/service/data/SyntaxTree/LetKeyword.fs.bsl b/tests/service/data/SyntaxTree/LetKeyword.fs.bsl
index 5b0b88f7e87..e161888721c 100644
--- a/tests/service/data/SyntaxTree/LetKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LetKeyword.fs.bsl
@@ -7,7 +7,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -18,8 +18,8 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (b, None), false, None,
-                           /root/LetKeyword.fs (1,6--1,7))], None,
-                     /root/LetKeyword.fs (1,4--1,7)), None,
+                           /root/LetKeyword.fs (2,6--2,7))], None,
+                     /root/LetKeyword.fs (2,4--2,7)), None,
                   App
                     (NonAtomic, false,
                      App
@@ -28,15 +28,15 @@ ImplFile
                           (false,
                            SynLongIdent
                              ([op_Addition], [], [Some (OriginalNotation "+")]),
-                           None, /root/LetKeyword.fs (1,12--1,13)), Ident b,
-                        /root/LetKeyword.fs (1,10--1,13)),
-                     Const (Int32 1, /root/LetKeyword.fs (1,14--1,15)),
-                     /root/LetKeyword.fs (1,10--1,15)),
-                  /root/LetKeyword.fs (1,4--1,7), NoneAtLet,
-                  { LeadingKeyword = Let /root/LetKeyword.fs (1,0--1,3)
+                           None, /root/LetKeyword.fs (2,12--2,13)), Ident b,
+                        /root/LetKeyword.fs (2,10--2,13)),
+                     Const (Int32 1, /root/LetKeyword.fs (2,14--2,15)),
+                     /root/LetKeyword.fs (2,10--2,15)),
+                  /root/LetKeyword.fs (2,4--2,7), NoneAtLet,
+                  { LeadingKeyword = Let /root/LetKeyword.fs (2,0--2,3)
                     InlineKeyword = None
-                    EqualsRange = Some /root/LetKeyword.fs (1,8--1,9) })],
-              /root/LetKeyword.fs (1,0--1,15))], PreXmlDocEmpty, [], None,
-          /root/LetKeyword.fs (1,0--1,15), { LeadingKeyword = None })],
+                    EqualsRange = Some /root/LetKeyword.fs (2,8--2,9) })],
+              /root/LetKeyword.fs (2,0--2,15))], PreXmlDocEmpty, [], None,
+          /root/LetKeyword.fs (2,0--3,0), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LetRecKeyword.fs b/tests/service/data/SyntaxTree/LetRecKeyword.fs
index 3f1377946ad..5d0dc5b2e22 100644
--- a/tests/service/data/SyntaxTree/LetRecKeyword.fs
+++ b/tests/service/data/SyntaxTree/LetRecKeyword.fs
@@ -1 +1,2 @@
-let rec a b = b + 1
\ No newline at end of file
+
+let rec a b = b + 1
diff --git a/tests/service/data/SyntaxTree/LetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LetRecKeyword.fs.bsl
index 246b6e90b97..e560020d8a1 100644
--- a/tests/service/data/SyntaxTree/LetRecKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LetRecKeyword.fs.bsl
@@ -7,7 +7,7 @@ ImplFile
              (true,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -18,8 +18,8 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (b, None), false, None,
-                           /root/LetRecKeyword.fs (1,10--1,11))], None,
-                     /root/LetRecKeyword.fs (1,8--1,11)), None,
+                           /root/LetRecKeyword.fs (2,10--2,11))], None,
+                     /root/LetRecKeyword.fs (2,8--2,11)), None,
                   App
                     (NonAtomic, false,
                      App
@@ -28,18 +28,18 @@ ImplFile
                           (false,
                            SynLongIdent
                              ([op_Addition], [], [Some (OriginalNotation "+")]),
-                           None, /root/LetRecKeyword.fs (1,16--1,17)), Ident b,
-                        /root/LetRecKeyword.fs (1,14--1,17)),
-                     Const (Int32 1, /root/LetRecKeyword.fs (1,18--1,19)),
-                     /root/LetRecKeyword.fs (1,14--1,19)),
-                  /root/LetRecKeyword.fs (1,8--1,11), NoneAtLet,
+                           None, /root/LetRecKeyword.fs (2,16--2,17)), Ident b,
+                        /root/LetRecKeyword.fs (2,14--2,17)),
+                     Const (Int32 1, /root/LetRecKeyword.fs (2,18--2,19)),
+                     /root/LetRecKeyword.fs (2,14--2,19)),
+                  /root/LetRecKeyword.fs (2,8--2,11), NoneAtLet,
                   { LeadingKeyword =
                      LetRec
-                       (/root/LetRecKeyword.fs (1,0--1,3),
-                        /root/LetRecKeyword.fs (1,4--1,7))
+                       (/root/LetRecKeyword.fs (2,0--2,3),
+                        /root/LetRecKeyword.fs (2,4--2,7))
                     InlineKeyword = None
-                    EqualsRange = Some /root/LetRecKeyword.fs (1,12--1,13) })],
-              /root/LetRecKeyword.fs (1,0--1,19))], PreXmlDocEmpty, [], None,
-          /root/LetRecKeyword.fs (1,0--1,19), { LeadingKeyword = None })],
+                    EqualsRange = Some /root/LetRecKeyword.fs (2,12--2,13) })],
+              /root/LetRecKeyword.fs (2,0--2,19))], PreXmlDocEmpty, [], None,
+          /root/LetRecKeyword.fs (2,0--3,0), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs b/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs
index 297802ae240..c5e61fb1761 100644
--- a/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs
+++ b/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs
@@ -1,2 +1,3 @@
+
 let n = 1.0m<cm>
-let m = 7.000<cm>
\ No newline at end of file
+let m = 7.000<cm>
diff --git a/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs.bsl b/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs.bsl
index 62b0141c0ff..caca879b975 100644
--- a/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs.bsl
+++ b/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs.bsl
@@ -8,66 +8,66 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (n, None), false, None,
-                     /root/MeasureContainsTheRangeOfTheConstant.fs (1,4--1,5)),
+                     /root/MeasureContainsTheRangeOfTheConstant.fs (2,4--2,5)),
                   None,
                   Const
                     (Measure
                        (Decimal 1.0M,
-                        /root/MeasureContainsTheRangeOfTheConstant.fs (1,8--1,12),
+                        /root/MeasureContainsTheRangeOfTheConstant.fs (2,8--2,12),
                         Seq
                           ([Named
                               ([cm],
-                               /root/MeasureContainsTheRangeOfTheConstant.fs (1,13--1,15))],
-                           /root/MeasureContainsTheRangeOfTheConstant.fs (1,13--1,15))),
-                     /root/MeasureContainsTheRangeOfTheConstant.fs (1,8--1,16)),
-                  /root/MeasureContainsTheRangeOfTheConstant.fs (1,4--1,5),
-                  Yes /root/MeasureContainsTheRangeOfTheConstant.fs (1,0--1,16),
+                               /root/MeasureContainsTheRangeOfTheConstant.fs (2,13--2,15))],
+                           /root/MeasureContainsTheRangeOfTheConstant.fs (2,13--2,15))),
+                     /root/MeasureContainsTheRangeOfTheConstant.fs (2,8--2,16)),
+                  /root/MeasureContainsTheRangeOfTheConstant.fs (2,4--2,5),
+                  Yes /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,16),
                   { LeadingKeyword =
                      Let
-                       /root/MeasureContainsTheRangeOfTheConstant.fs (1,0--1,3)
+                       /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/MeasureContainsTheRangeOfTheConstant.fs (1,6--1,7) })],
-              /root/MeasureContainsTheRangeOfTheConstant.fs (1,0--1,16));
+                       /root/MeasureContainsTheRangeOfTheConstant.fs (2,6--2,7) })],
+              /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,16));
            Let
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (m, None), false, None,
-                     /root/MeasureContainsTheRangeOfTheConstant.fs (2,4--2,5)),
+                     /root/MeasureContainsTheRangeOfTheConstant.fs (3,4--3,5)),
                   None,
                   Const
                     (Measure
                        (Double 7.0,
-                        /root/MeasureContainsTheRangeOfTheConstant.fs (2,8--2,13),
+                        /root/MeasureContainsTheRangeOfTheConstant.fs (3,8--3,13),
                         Seq
                           ([Named
                               ([cm],
-                               /root/MeasureContainsTheRangeOfTheConstant.fs (2,14--2,16))],
-                           /root/MeasureContainsTheRangeOfTheConstant.fs (2,14--2,16))),
-                     /root/MeasureContainsTheRangeOfTheConstant.fs (2,8--2,17)),
-                  /root/MeasureContainsTheRangeOfTheConstant.fs (2,4--2,5),
-                  Yes /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,17),
+                               /root/MeasureContainsTheRangeOfTheConstant.fs (3,14--3,16))],
+                           /root/MeasureContainsTheRangeOfTheConstant.fs (3,14--3,16))),
+                     /root/MeasureContainsTheRangeOfTheConstant.fs (3,8--3,17)),
+                  /root/MeasureContainsTheRangeOfTheConstant.fs (3,4--3,5),
+                  Yes /root/MeasureContainsTheRangeOfTheConstant.fs (3,0--3,17),
                   { LeadingKeyword =
                      Let
-                       /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,3)
+                       /root/MeasureContainsTheRangeOfTheConstant.fs (3,0--3,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/MeasureContainsTheRangeOfTheConstant.fs (2,6--2,7) })],
-              /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,17))],
+                       /root/MeasureContainsTheRangeOfTheConstant.fs (3,6--3,7) })],
+              /root/MeasureContainsTheRangeOfTheConstant.fs (3,0--3,17))],
           PreXmlDocEmpty, [], None,
-          /root/MeasureContainsTheRangeOfTheConstant.fs (1,0--2,17),
+          /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberKeyword.fs b/tests/service/data/SyntaxTree/MemberKeyword.fs
index c1ea18e0255..86e14588764 100644
--- a/tests/service/data/SyntaxTree/MemberKeyword.fs
+++ b/tests/service/data/SyntaxTree/MemberKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    member this.Y ()  = ()
\ No newline at end of file
+    member this.Y ()  = ()
diff --git a/tests/service/data/SyntaxTree/MemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberKeyword.fs.bsl
index 5e02d22f3e9..6ae13f27701 100644
--- a/tests/service/data/SyntaxTree/MemberKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/MemberKeyword.fs.bsl
@@ -7,14 +7,14 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/MemberKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/MemberKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -28,29 +28,29 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; Y],
-                                  [/root/MemberKeyword.fs (2,15--2,16)],
+                                  [/root/MemberKeyword.fs (3,15--3,16)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/MemberKeyword.fs (2,18--2,20)),
-                                     /root/MemberKeyword.fs (2,18--2,20))], None,
-                               /root/MemberKeyword.fs (2,11--2,20)), None,
-                            Const (Unit, /root/MemberKeyword.fs (2,24--2,26)),
-                            /root/MemberKeyword.fs (2,11--2,20), NoneAtInvisible,
+                                        /root/MemberKeyword.fs (3,18--3,20)),
+                                     /root/MemberKeyword.fs (3,18--3,20))], None,
+                               /root/MemberKeyword.fs (3,11--3,20)), None,
+                            Const (Unit, /root/MemberKeyword.fs (3,24--3,26)),
+                            /root/MemberKeyword.fs (3,11--3,20), NoneAtInvisible,
                             { LeadingKeyword =
-                               Member /root/MemberKeyword.fs (2,4--2,10)
+                               Member /root/MemberKeyword.fs (3,4--3,10)
                               InlineKeyword = None
                               EqualsRange =
-                               Some /root/MemberKeyword.fs (2,22--2,23) }),
-                         /root/MemberKeyword.fs (2,4--2,26))],
-                     /root/MemberKeyword.fs (2,4--2,26)), [], None,
-                  /root/MemberKeyword.fs (1,5--2,26),
-                  { LeadingKeyword = Type /root/MemberKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/MemberKeyword.fs (1,7--1,8)
-                    WithKeyword = None })], /root/MemberKeyword.fs (1,0--2,26))],
-          PreXmlDocEmpty, [], None, /root/MemberKeyword.fs (1,0--2,26),
+                               Some /root/MemberKeyword.fs (3,22--3,23) }),
+                         /root/MemberKeyword.fs (3,4--3,26))],
+                     /root/MemberKeyword.fs (3,4--3,26)), [], None,
+                  /root/MemberKeyword.fs (2,5--3,26),
+                  { LeadingKeyword = Type /root/MemberKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/MemberKeyword.fs (2,7--2,8)
+                    WithKeyword = None })], /root/MemberKeyword.fs (2,0--3,26))],
+          PreXmlDocEmpty, [], None, /root/MemberKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi b/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi
index 09bdee493eb..30383972f0b 100644
--- a/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi
+++ b/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi
@@ -1,4 +1,5 @@
+
 namespace X
 
 type Foo =
-    abstract member Bar : int with get,set
\ No newline at end of file
+    abstract member Bar : int with get,set
diff --git a/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
index 4ca021be4bd..27bff41007e 100644
--- a/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
@@ -10,9 +10,9 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (3,5--3,8)),
+                     /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--4,8)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -22,17 +22,17 @@ SigFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,4--4,42),
+                            /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,4--5,42),
                             { LeadingKeyword =
                                AbstractMember
-                                 (/root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,4--4,12),
-                                  /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,13--4,19))
+                                 (/root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,4--5,12),
+                                  /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,13--5,19))
                               InlineKeyword = None
                               WithKeyword =
                                Some
-                                 /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,30--4,34)
+                                 /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,30--5,34)
                               EqualsRange = None }),
                          { IsInstance = true
                            IsDispatchSlot = true
@@ -40,27 +40,27 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGetSet },
-                         /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,4--4,42),
+                         /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,4--5,42),
                          { GetSetKeywords =
                             Some
                               (GetSet
-                                 (/root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,35--4,38),
-                                  /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,39--4,42))) })],
-                     /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,4--4,42)),
+                                 (/root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,35--5,38),
+                                  /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,39--5,42))) })],
+                     /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,4--5,42)),
                   [],
-                  /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (3,5--4,42),
+                  /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--5,42),
                   { LeadingKeyword =
                      Type
-                       /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--3,4)
+                       /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (3,9--3,10)
+                       /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,9--4,10)
                     WithKeyword = None })],
-              /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--4,42))],
+              /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--5,42))],
           PreXmlDocEmpty, [], None,
-          /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (1,0--4,42),
+          /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--5,42),
           { LeadingKeyword =
              Namespace
-               /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (1,0--1,9) })],
+               /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberValKeyword.fs b/tests/service/data/SyntaxTree/MemberValKeyword.fs
index 430c5129838..1f187569dfd 100644
--- a/tests/service/data/SyntaxTree/MemberValKeyword.fs
+++ b/tests/service/data/SyntaxTree/MemberValKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    member val Y : int = 1
\ No newline at end of file
+    member val Y : int = 1
diff --git a/tests/service/data/SyntaxTree/MemberValKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberValKeyword.fs.bsl
index feb712df7c2..5a558f124d8 100644
--- a/tests/service/data/SyntaxTree/MemberValKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/MemberValKeyword.fs.bsl
@@ -8,8 +8,8 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/MemberValKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/MemberValKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AutoProperty
@@ -27,24 +27,24 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None,
-                         Const (Int32 1, /root/MemberValKeyword.fs (2,25--2,26)),
-                         /root/MemberValKeyword.fs (2,4--2,26),
+                         Const (Int32 1, /root/MemberValKeyword.fs (3,25--3,26)),
+                         /root/MemberValKeyword.fs (3,4--3,26),
                          { LeadingKeyword =
                             MemberVal
-                              (/root/MemberValKeyword.fs (2,4--2,10),
-                               /root/MemberValKeyword.fs (2,11--2,14))
+                              (/root/MemberValKeyword.fs (3,4--3,10),
+                               /root/MemberValKeyword.fs (3,11--3,14))
                            WithKeyword = None
                            EqualsRange =
-                            Some /root/MemberValKeyword.fs (2,23--2,24)
+                            Some /root/MemberValKeyword.fs (3,23--3,24)
                            GetSetKeywords = None })],
-                     /root/MemberValKeyword.fs (2,4--2,26)), [], None,
-                  /root/MemberValKeyword.fs (1,5--2,26),
-                  { LeadingKeyword = Type /root/MemberValKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/MemberValKeyword.fs (1,7--1,8)
+                     /root/MemberValKeyword.fs (3,4--3,26)), [], None,
+                  /root/MemberValKeyword.fs (2,5--3,26),
+                  { LeadingKeyword = Type /root/MemberValKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/MemberValKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/MemberValKeyword.fs (1,0--2,26))], PreXmlDocEmpty, [], None,
-          /root/MemberValKeyword.fs (1,0--2,26), { LeadingKeyword = None })],
+              /root/MemberValKeyword.fs (2,0--3,26))], PreXmlDocEmpty, [], None,
+          /root/MemberValKeyword.fs (2,0--4,0), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs b/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs
index 57849183b07..fd19ad0caa2 100644
--- a/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs
+++ b/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    member inline x.Y () = ()
\ No newline at end of file
+    member inline x.Y () = ()
diff --git a/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs.bsl
index 0c41384c041..a4083e1c692 100644
--- a/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs.bsl
@@ -8,14 +8,14 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/MemberWithInlineKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/MemberWithInlineKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
                         (SynBinding
                            (None, Normal, true, false, [],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -29,41 +29,41 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([x; Y],
-                                  [/root/MemberWithInlineKeyword.fs (2,19--2,20)],
+                                  [/root/MemberWithInlineKeyword.fs (3,19--3,20)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/MemberWithInlineKeyword.fs (2,22--2,24)),
-                                     /root/MemberWithInlineKeyword.fs (2,22--2,24))],
+                                        /root/MemberWithInlineKeyword.fs (3,22--3,24)),
+                                     /root/MemberWithInlineKeyword.fs (3,22--3,24))],
                                None,
-                               /root/MemberWithInlineKeyword.fs (2,18--2,24)),
+                               /root/MemberWithInlineKeyword.fs (3,18--3,24)),
                             None,
                             Const
                               (Unit,
-                               /root/MemberWithInlineKeyword.fs (2,27--2,29)),
-                            /root/MemberWithInlineKeyword.fs (2,18--2,24),
+                               /root/MemberWithInlineKeyword.fs (3,27--3,29)),
+                            /root/MemberWithInlineKeyword.fs (3,18--3,24),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/MemberWithInlineKeyword.fs (2,4--2,10)
+                                 /root/MemberWithInlineKeyword.fs (3,4--3,10)
                               InlineKeyword =
                                Some
-                                 /root/MemberWithInlineKeyword.fs (2,11--2,17)
+                                 /root/MemberWithInlineKeyword.fs (3,11--3,17)
                               EqualsRange =
                                Some
-                                 /root/MemberWithInlineKeyword.fs (2,25--2,26) }),
-                         /root/MemberWithInlineKeyword.fs (2,4--2,29))],
-                     /root/MemberWithInlineKeyword.fs (2,4--2,29)), [], None,
-                  /root/MemberWithInlineKeyword.fs (1,5--2,29),
+                                 /root/MemberWithInlineKeyword.fs (3,25--3,26) }),
+                         /root/MemberWithInlineKeyword.fs (3,4--3,29))],
+                     /root/MemberWithInlineKeyword.fs (3,4--3,29)), [], None,
+                  /root/MemberWithInlineKeyword.fs (2,5--3,29),
                   { LeadingKeyword =
-                     Type /root/MemberWithInlineKeyword.fs (1,0--1,4)
+                     Type /root/MemberWithInlineKeyword.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/MemberWithInlineKeyword.fs (1,7--1,8)
+                     Some /root/MemberWithInlineKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/MemberWithInlineKeyword.fs (1,0--2,29))], PreXmlDocEmpty, [],
-          None, /root/MemberWithInlineKeyword.fs (1,0--2,29),
+              /root/MemberWithInlineKeyword.fs (2,0--3,29))], PreXmlDocEmpty, [],
+          None, /root/MemberWithInlineKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs
index 1bdecebd85a..e75bb28a429 100644
--- a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs
+++ b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs
@@ -1,4 +1,5 @@
+
 [<  Foo  >]
 module Bar
 
-let s : string = "s"
\ No newline at end of file
+let s : string = "s"
diff --git a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs.bsl b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
index 470bcc080ef..ca29cbf2052 100644
--- a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
+++ b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
@@ -8,53 +8,53 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (s, None), false, None,
-                     /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,4--4,5)),
+                     /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,4--5,5)),
                   Some
                     (SynBindingReturnInfo
                        (LongIdent (SynLongIdent ([string], [], [None])),
-                        /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,8--4,14),
+                        /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,8--5,14),
                         [],
                         { ColonRange =
                            Some
-                             /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,6--4,7) })),
+                             /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,6--5,7) })),
                   Typed
                     (Const
                        (String
                           ("s", Regular,
-                           /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,17--4,20)),
-                        /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,17--4,20)),
+                           /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,17--5,20)),
+                        /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,17--5,20)),
                      LongIdent (SynLongIdent ([string], [], [None])),
-                     /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,17--4,20)),
-                  /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,4--4,5),
+                     /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,17--5,20)),
+                  /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,4--5,5),
                   Yes
-                    /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,0--4,20),
+                    /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,0--5,20),
                   { LeadingKeyword =
                      Let
-                       /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,0--4,3)
+                       /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,0--5,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,15--4,16) })],
-              /root/ModuleRangeShouldStartAtFirstAttribute.fs (4,0--4,20))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                       /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,15--5,16) })],
+              /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,0--5,20))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
           [{ Attributes =
               [{ TypeName = SynLongIdent ([Foo], [], [None])
                  ArgExpr =
                   Const
                     (Unit,
-                     /root/ModuleRangeShouldStartAtFirstAttribute.fs (1,4--1,7))
+                     /root/ModuleRangeShouldStartAtFirstAttribute.fs (2,4--2,7))
                  Target = None
                  AppliesToGetterAndSetter = false
                  Range =
-                  /root/ModuleRangeShouldStartAtFirstAttribute.fs (1,4--1,7) }]
-             Range = /root/ModuleRangeShouldStartAtFirstAttribute.fs (1,0--1,11) }],
-          None, /root/ModuleRangeShouldStartAtFirstAttribute.fs (1,0--4,20),
+                  /root/ModuleRangeShouldStartAtFirstAttribute.fs (2,4--2,7) }]
+             Range = /root/ModuleRangeShouldStartAtFirstAttribute.fs (2,0--2,11) }],
+          None, /root/ModuleRangeShouldStartAtFirstAttribute.fs (2,0--5,20),
           { LeadingKeyword =
-             Module /root/ModuleRangeShouldStartAtFirstAttribute.fs (2,0--2,6) })],
+             Module /root/ModuleRangeShouldStartAtFirstAttribute.fs (3,0--3,6) })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi
index 3eec4a8556c..41ed2f5997e 100644
--- a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi
+++ b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi
@@ -1,4 +1,5 @@
+
 [<  Foo  >]
 module Bar
 
-val s : string
\ No newline at end of file
+val s : string
diff --git a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
index 9658e48216e..a3031ffccb7 100644
--- a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
@@ -9,31 +9,31 @@ SigFile
                 ([], SynIdent (s, None), SynValTyparDecls (None, true),
                  LongIdent (SynLongIdent ([string], [], [None])),
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector), None,
                  None,
-                 /root/ModuleRangeShouldStartAtFirstAttribute.fsi (4,0--4,14),
+                 /root/ModuleRangeShouldStartAtFirstAttribute.fsi (5,0--5,14),
                  { LeadingKeyword =
                     Val
-                      /root/ModuleRangeShouldStartAtFirstAttribute.fsi (4,0--4,3)
+                      /root/ModuleRangeShouldStartAtFirstAttribute.fsi (5,0--5,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/ModuleRangeShouldStartAtFirstAttribute.fsi (4,0--4,14))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+              /root/ModuleRangeShouldStartAtFirstAttribute.fsi (5,0--5,14))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
           [{ Attributes =
               [{ TypeName = SynLongIdent ([Foo], [], [None])
                  ArgExpr =
                   Const
                     (Unit,
-                     /root/ModuleRangeShouldStartAtFirstAttribute.fsi (1,4--1,7))
+                     /root/ModuleRangeShouldStartAtFirstAttribute.fsi (2,4--2,7))
                  Target = None
                  AppliesToGetterAndSetter = false
                  Range =
-                  /root/ModuleRangeShouldStartAtFirstAttribute.fsi (1,4--1,7) }]
+                  /root/ModuleRangeShouldStartAtFirstAttribute.fsi (2,4--2,7) }]
              Range =
-              /root/ModuleRangeShouldStartAtFirstAttribute.fsi (1,0--1,11) }],
-          None, /root/ModuleRangeShouldStartAtFirstAttribute.fsi (1,0--4,14),
+              /root/ModuleRangeShouldStartAtFirstAttribute.fsi (2,0--2,11) }],
+          None, /root/ModuleRangeShouldStartAtFirstAttribute.fsi (2,0--5,14),
           { LeadingKeyword =
-             Module /root/ModuleRangeShouldStartAtFirstAttribute.fsi (2,0--2,6) })],
+             Module /root/ModuleRangeShouldStartAtFirstAttribute.fsi (3,0--3,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs
index 51d9bc2a74d..fa4dd8f8871 100644
--- a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs
+++ b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs
@@ -1,3 +1,4 @@
+
 /// this file contains patches to the F# Compiler Service that have not yet made it into
 /// published nuget packages.  We source-copy them here to have a consistent location for our to-be-removed extensions
 
@@ -9,4 +10,4 @@ open FsAutoComplete.UntypedAstUtils
 open FSharp.Compiler.CodeAnalysis
 
 module internal SynExprAppLocationsImpl =
-let a = 42
\ No newline at end of file
+let a = 42
diff --git a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs.bsl
index fc9cf13ea89..4b950b54884 100644
--- a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs.bsl
@@ -8,79 +8,79 @@ ImplFile
              (ModuleOrNamespace
                 (SynLongIdent
                    ([FSharp; Compiler; Syntax],
-                    [/root/ModuleShouldContainModuleKeyword.fs (6,11--6,12);
-                     /root/ModuleShouldContainModuleKeyword.fs (6,20--6,21)],
+                    [/root/ModuleShouldContainModuleKeyword.fs (7,11--7,12);
+                     /root/ModuleShouldContainModuleKeyword.fs (7,20--7,21)],
                     [None; None; None]),
-                 /root/ModuleShouldContainModuleKeyword.fs (6,5--6,27)),
-              /root/ModuleShouldContainModuleKeyword.fs (6,0--6,27));
+                 /root/ModuleShouldContainModuleKeyword.fs (7,5--7,27)),
+              /root/ModuleShouldContainModuleKeyword.fs (7,0--7,27));
            Open
              (ModuleOrNamespace
                 (SynLongIdent
                    ([FSharp; Compiler; Text],
-                    [/root/ModuleShouldContainModuleKeyword.fs (7,11--7,12);
-                     /root/ModuleShouldContainModuleKeyword.fs (7,20--7,21)],
+                    [/root/ModuleShouldContainModuleKeyword.fs (8,11--8,12);
+                     /root/ModuleShouldContainModuleKeyword.fs (8,20--8,21)],
                     [None; None; None]),
-                 /root/ModuleShouldContainModuleKeyword.fs (7,5--7,25)),
-              /root/ModuleShouldContainModuleKeyword.fs (7,0--7,25));
+                 /root/ModuleShouldContainModuleKeyword.fs (8,5--8,25)),
+              /root/ModuleShouldContainModuleKeyword.fs (8,0--8,25));
            Open
              (ModuleOrNamespace
                 (SynLongIdent
                    ([FsAutoComplete; UntypedAstUtils],
-                    [/root/ModuleShouldContainModuleKeyword.fs (8,19--8,20)],
+                    [/root/ModuleShouldContainModuleKeyword.fs (9,19--9,20)],
                     [None; None]),
-                 /root/ModuleShouldContainModuleKeyword.fs (8,5--8,35)),
-              /root/ModuleShouldContainModuleKeyword.fs (8,0--8,35));
+                 /root/ModuleShouldContainModuleKeyword.fs (9,5--9,35)),
+              /root/ModuleShouldContainModuleKeyword.fs (9,0--9,35));
            Open
              (ModuleOrNamespace
                 (SynLongIdent
                    ([FSharp; Compiler; CodeAnalysis],
-                    [/root/ModuleShouldContainModuleKeyword.fs (9,11--9,12);
-                     /root/ModuleShouldContainModuleKeyword.fs (9,20--9,21)],
+                    [/root/ModuleShouldContainModuleKeyword.fs (10,11--10,12);
+                     /root/ModuleShouldContainModuleKeyword.fs (10,20--10,21)],
                     [None; None; None]),
-                 /root/ModuleShouldContainModuleKeyword.fs (9,5--9,33)),
-              /root/ModuleShouldContainModuleKeyword.fs (9,0--9,33));
+                 /root/ModuleShouldContainModuleKeyword.fs (10,5--10,33)),
+              /root/ModuleShouldContainModuleKeyword.fs (10,0--10,33));
            NestedModule
              (SynComponentInfo
                 ([], None, [], [SynExprAppLocationsImpl],
-                 PreXmlDoc ((11,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 PreXmlDoc ((12,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  Some
                    (Internal
-                      /root/ModuleShouldContainModuleKeyword.fs (11,7--11,15)),
-                 /root/ModuleShouldContainModuleKeyword.fs (11,0--11,39)), false,
+                      /root/ModuleShouldContainModuleKeyword.fs (12,7--12,15)),
+                 /root/ModuleShouldContainModuleKeyword.fs (12,0--12,39)), false,
               [Let
                  (false,
                   [SynBinding
                      (None, Normal, false, false, [],
-                      PreXmlDoc ((12,0), FSharp.Compiler.Xml.XmlDocCollector),
+                      PreXmlDoc ((13,0), FSharp.Compiler.Xml.XmlDocCollector),
                       SynValData
                         (None, SynValInfo ([], SynArgInfo ([], false, None)),
                          None),
                       Named
                         (SynIdent (a, None), false, None,
-                         /root/ModuleShouldContainModuleKeyword.fs (12,4--12,5)),
+                         /root/ModuleShouldContainModuleKeyword.fs (13,4--13,5)),
                       None,
                       Const
                         (Int32 42,
-                         /root/ModuleShouldContainModuleKeyword.fs (12,8--12,10)),
-                      /root/ModuleShouldContainModuleKeyword.fs (12,4--12,5),
+                         /root/ModuleShouldContainModuleKeyword.fs (13,8--13,10)),
+                      /root/ModuleShouldContainModuleKeyword.fs (13,4--13,5),
                       Yes
-                        /root/ModuleShouldContainModuleKeyword.fs (12,0--12,10),
+                        /root/ModuleShouldContainModuleKeyword.fs (13,0--13,10),
                       { LeadingKeyword =
                          Let
-                           /root/ModuleShouldContainModuleKeyword.fs (12,0--12,3)
+                           /root/ModuleShouldContainModuleKeyword.fs (13,0--13,3)
                         InlineKeyword = None
                         EqualsRange =
                          Some
-                           /root/ModuleShouldContainModuleKeyword.fs (12,6--12,7) })],
-                  /root/ModuleShouldContainModuleKeyword.fs (12,0--12,10))],
-              false, /root/ModuleShouldContainModuleKeyword.fs (11,0--12,10),
+                           /root/ModuleShouldContainModuleKeyword.fs (13,6--13,7) })],
+                  /root/ModuleShouldContainModuleKeyword.fs (13,0--13,10))],
+              false, /root/ModuleShouldContainModuleKeyword.fs (12,0--13,10),
               { ModuleKeyword =
-                 Some /root/ModuleShouldContainModuleKeyword.fs (11,0--11,6)
+                 Some /root/ModuleShouldContainModuleKeyword.fs (12,0--12,6)
                 EqualsRange =
-                 Some /root/ModuleShouldContainModuleKeyword.fs (11,40--11,41) })],
-          PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/ModuleShouldContainModuleKeyword.fs (1,0--12,10),
+                 Some /root/ModuleShouldContainModuleKeyword.fs (12,40--12,41) })],
+          PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/ModuleShouldContainModuleKeyword.fs (2,0--13,10),
           { LeadingKeyword =
-             Module /root/ModuleShouldContainModuleKeyword.fs (4,0--4,6) })],
+             Module /root/ModuleShouldContainModuleKeyword.fs (5,0--5,6) })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi
index b3753fdadd4..ce9126d8a3b 100644
--- a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi
+++ b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi
@@ -1,3 +1,4 @@
+
 module Bar
 
-val a: int
\ No newline at end of file
+val a: int
diff --git a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi.bsl
index 99f21cbee02..d42fb78d1db 100644
--- a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi.bsl
@@ -9,17 +9,17 @@ SigFile
                 ([], SynIdent (a, None), SynValTyparDecls (None, true),
                  LongIdent (SynLongIdent ([int], [], [None])),
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 None, /root/ModuleShouldContainModuleKeyword.fsi (3,0--3,10),
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None, /root/ModuleShouldContainModuleKeyword.fsi (4,0--4,10),
                  { LeadingKeyword =
-                    Val /root/ModuleShouldContainModuleKeyword.fsi (3,0--3,3)
+                    Val /root/ModuleShouldContainModuleKeyword.fsi (4,0--4,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/ModuleShouldContainModuleKeyword.fsi (3,0--3,10))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/ModuleShouldContainModuleKeyword.fsi (1,0--3,10),
+              /root/ModuleShouldContainModuleKeyword.fsi (4,0--4,10))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/ModuleShouldContainModuleKeyword.fsi (2,0--4,10),
           { LeadingKeyword =
-             Module /root/ModuleShouldContainModuleKeyword.fsi (1,0--1,6) })],
+             Module /root/ModuleShouldContainModuleKeyword.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs
index dce7be4dddd..042611c3ee0 100644
--- a/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs
+++ b/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs
@@ -1,3 +1,4 @@
+
 fun x y z
                             ->
-                                x * y * z
\ No newline at end of file
+                                x * y * z
diff --git a/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs.bsl
index c6aaf24c6b2..ad36e6bce11 100644
--- a/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs.bsl
@@ -10,22 +10,22 @@ ImplFile
                  SimplePats
                    ([Id
                        (x, None, false, false, false,
-                        /root/MultilineLambdaHasArrowRange.fs (1,4--1,5))],
-                    /root/MultilineLambdaHasArrowRange.fs (1,4--1,5)),
+                        /root/MultilineLambdaHasArrowRange.fs (2,4--2,5))],
+                    /root/MultilineLambdaHasArrowRange.fs (2,4--2,5)),
                  Lambda
                    (false, true,
                     SimplePats
                       ([Id
                           (y, None, false, false, false,
-                           /root/MultilineLambdaHasArrowRange.fs (1,6--1,7))],
-                       /root/MultilineLambdaHasArrowRange.fs (1,6--1,7)),
+                           /root/MultilineLambdaHasArrowRange.fs (2,6--2,7))],
+                       /root/MultilineLambdaHasArrowRange.fs (2,6--2,7)),
                     Lambda
                       (false, true,
                        SimplePats
                          ([Id
                              (z, None, false, false, false,
-                              /root/MultilineLambdaHasArrowRange.fs (1,8--1,9))],
-                          /root/MultilineLambdaHasArrowRange.fs (1,8--1,9)),
+                              /root/MultilineLambdaHasArrowRange.fs (2,8--2,9))],
+                          /root/MultilineLambdaHasArrowRange.fs (2,8--2,9)),
                        App
                          (NonAtomic, false,
                           App
@@ -35,7 +35,7 @@ ImplFile
                                 SynLongIdent
                                   ([op_Multiply], [],
                                    [Some (OriginalNotation "*")]), None,
-                                /root/MultilineLambdaHasArrowRange.fs (3,38--3,39)),
+                                /root/MultilineLambdaHasArrowRange.fs (4,38--4,39)),
                              App
                                (NonAtomic, false,
                                 App
@@ -45,31 +45,31 @@ ImplFile
                                       SynLongIdent
                                         ([op_Multiply], [],
                                          [Some (OriginalNotation "*")]), None,
-                                      /root/MultilineLambdaHasArrowRange.fs (3,34--3,35)),
+                                      /root/MultilineLambdaHasArrowRange.fs (4,34--4,35)),
                                    Ident x,
-                                   /root/MultilineLambdaHasArrowRange.fs (3,32--3,35)),
+                                   /root/MultilineLambdaHasArrowRange.fs (4,32--4,35)),
                                 Ident y,
-                                /root/MultilineLambdaHasArrowRange.fs (3,32--3,37)),
-                             /root/MultilineLambdaHasArrowRange.fs (3,32--3,39)),
+                                /root/MultilineLambdaHasArrowRange.fs (4,32--4,37)),
+                             /root/MultilineLambdaHasArrowRange.fs (4,32--4,39)),
                           Ident z,
-                          /root/MultilineLambdaHasArrowRange.fs (3,32--3,41)),
-                       None, /root/MultilineLambdaHasArrowRange.fs (1,0--3,41),
+                          /root/MultilineLambdaHasArrowRange.fs (4,32--4,41)),
+                       None, /root/MultilineLambdaHasArrowRange.fs (2,0--4,41),
                        { ArrowRange =
                           Some
-                            /root/MultilineLambdaHasArrowRange.fs (2,28--2,30) }),
-                    None, /root/MultilineLambdaHasArrowRange.fs (1,0--3,41),
+                            /root/MultilineLambdaHasArrowRange.fs (3,28--3,30) }),
+                    None, /root/MultilineLambdaHasArrowRange.fs (2,0--4,41),
                     { ArrowRange =
-                       Some /root/MultilineLambdaHasArrowRange.fs (2,28--2,30) }),
+                       Some /root/MultilineLambdaHasArrowRange.fs (3,28--3,30) }),
                  Some
                    ([Named
                        (SynIdent (x, None), false, None,
-                        /root/MultilineLambdaHasArrowRange.fs (1,4--1,5));
+                        /root/MultilineLambdaHasArrowRange.fs (2,4--2,5));
                      Named
                        (SynIdent (y, None), false, None,
-                        /root/MultilineLambdaHasArrowRange.fs (1,6--1,7));
+                        /root/MultilineLambdaHasArrowRange.fs (2,6--2,7));
                      Named
                        (SynIdent (z, None), false, None,
-                        /root/MultilineLambdaHasArrowRange.fs (1,8--1,9))],
+                        /root/MultilineLambdaHasArrowRange.fs (2,8--2,9))],
                     App
                       (NonAtomic, false,
                        App
@@ -79,7 +79,7 @@ ImplFile
                              SynLongIdent
                                ([op_Multiply], [], [Some (OriginalNotation "*")]),
                              None,
-                             /root/MultilineLambdaHasArrowRange.fs (3,38--3,39)),
+                             /root/MultilineLambdaHasArrowRange.fs (4,38--4,39)),
                           App
                             (NonAtomic, false,
                              App
@@ -89,20 +89,20 @@ ImplFile
                                    SynLongIdent
                                      ([op_Multiply], [],
                                       [Some (OriginalNotation "*")]), None,
-                                   /root/MultilineLambdaHasArrowRange.fs (3,34--3,35)),
+                                   /root/MultilineLambdaHasArrowRange.fs (4,34--4,35)),
                                 Ident x,
-                                /root/MultilineLambdaHasArrowRange.fs (3,32--3,35)),
+                                /root/MultilineLambdaHasArrowRange.fs (4,32--4,35)),
                              Ident y,
-                             /root/MultilineLambdaHasArrowRange.fs (3,32--3,37)),
-                          /root/MultilineLambdaHasArrowRange.fs (3,32--3,39)),
+                             /root/MultilineLambdaHasArrowRange.fs (4,32--4,37)),
+                          /root/MultilineLambdaHasArrowRange.fs (4,32--4,39)),
                        Ident z,
-                       /root/MultilineLambdaHasArrowRange.fs (3,32--3,41))),
-                 /root/MultilineLambdaHasArrowRange.fs (1,0--3,41),
+                       /root/MultilineLambdaHasArrowRange.fs (4,32--4,41))),
+                 /root/MultilineLambdaHasArrowRange.fs (2,0--4,41),
                  { ArrowRange =
-                    Some /root/MultilineLambdaHasArrowRange.fs (2,28--2,30) }),
-              /root/MultilineLambdaHasArrowRange.fs (1,0--3,41))],
+                    Some /root/MultilineLambdaHasArrowRange.fs (3,28--3,30) }),
+              /root/MultilineLambdaHasArrowRange.fs (2,0--4,41))],
           PreXmlDocEmpty, [], None,
-          /root/MultilineLambdaHasArrowRange.fs (1,0--3,41),
+          /root/MultilineLambdaHasArrowRange.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs b/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs
index d700c936366..e6b18c6900f 100644
--- a/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs
+++ b/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs
@@ -1,3 +1,4 @@
+
 namespace TypeEquality
 
 /// A type for witnessing type equality between 'a and 'b
@@ -5,4 +6,4 @@ type Teq = class end
 
 namespace Foobar
 
-let x = 42
\ No newline at end of file
+let x = 42
diff --git a/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
index ec72c97bdc3..cab794fa21a 100644
--- a/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
@@ -11,58 +11,58 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Teq],
-                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,5--4,8)),
+                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (5,5--5,8)),
                   ObjectModel
                     (Class, [],
-                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,11--4,20)),
+                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (5,11--5,20)),
                   [], None,
-                  /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (3,0--4,20),
+                  /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,0--5,20),
                   { LeadingKeyword =
                      Type
-                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,0--4,4)
+                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (5,0--5,4)
                     EqualsRange =
                      Some
-                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,9--4,10)
+                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (5,9--5,10)
                     WithKeyword = None })],
-              /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (3,0--4,20))],
+              /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,0--5,20))],
           PreXmlDocEmpty, [], None,
-          /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (1,0--4,20),
+          /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (2,0--5,20),
           { LeadingKeyword =
              Namespace
-               /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (1,0--1,9) });
+               /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (2,0--2,9) });
        SynModuleOrNamespace
          ([Foobar], false, DeclaredNamespace,
           [Let
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((8,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((9,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (x, None), false, None,
-                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,4--8,5)),
+                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,4--9,5)),
                   None,
                   Const
                     (Int32 42,
-                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,8--8,10)),
-                  /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,4--8,5),
+                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,8--9,10)),
+                  /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,4--9,5),
                   Yes
-                    /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,0--8,10),
+                    /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,0--9,10),
                   { LeadingKeyword =
                      Let
-                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,0--8,3)
+                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,0--9,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,6--8,7) })],
-              /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (8,0--8,10))],
+                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,6--9,7) })],
+              /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,0--9,10))],
           PreXmlDocEmpty, [], None,
-          /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (6,0--8,10),
+          /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (7,0--9,10),
           { LeadingKeyword =
              Namespace
-               /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (6,0--6,9) })],
+               /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (7,0--7,9) })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs b/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs
index c5690210106..85c93330b9c 100644
--- a/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs
+++ b/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs
@@ -1,3 +1,4 @@
+
 type Foo =
     | One =  0x00000001
-    | Two = 2
\ No newline at end of file
+    | Two = 2
diff --git a/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl b/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
index fbd9a69a84b..08e5a8d839d 100644
--- a/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
+++ b/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
@@ -8,49 +8,49 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (1,5--1,8)),
+                     /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,5--2,8)),
                   Simple
                     (Enum
                        ([SynEnumCase
                            ([], SynIdent (One, None),
                             Const
                               (Int32 1,
-                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,13--2,23)),
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,6--2,23),
+                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,13--3,23)),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,6--3,23),
                             { BarRange =
                                Some
-                                 /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,4--2,5)
+                                 /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,4--3,5)
                               EqualsRange =
-                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,10--2,11) });
+                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,10--3,11) });
                          SynEnumCase
                            ([], SynIdent (Two, None),
                             Const
                               (Int32 2,
-                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,12--3,13)),
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,6--3,13),
+                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (4,12--4,13)),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (4,6--4,13),
                             { BarRange =
                                Some
-                                 /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,4--3,5)
+                                 /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (4,4--4,5)
                               EqualsRange =
-                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,10--3,11) })],
-                        /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,4--3,13)),
-                     /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,4--3,13)),
+                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (4,10--4,11) })],
+                        /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,4--4,13)),
+                     /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,4--4,13)),
                   [], None,
-                  /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (1,5--3,13),
+                  /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,5--4,13),
                   { LeadingKeyword =
                      Type
-                       /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (1,0--1,4)
+                       /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (1,9--1,10)
+                       /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (1,0--3,13))],
+              /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,0--4,13))],
           PreXmlDocEmpty, [], None,
-          /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (1,0--3,13),
+          /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs b/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs
index fa68fa2b2a7..af2b2274143 100644
--- a/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs
+++ b/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs
@@ -1,3 +1,4 @@
+
 type Foo =
     | Bar = 1
-    | Bear = 2
\ No newline at end of file
+    | Bear = 2
diff --git a/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs.bsl b/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs.bsl
index b404830b689..cad8f027b80 100644
--- a/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs.bsl
@@ -8,46 +8,46 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/MultipleSynEnumCasesHaveBarRange.fs (1,5--1,8)),
+                     /root/MultipleSynEnumCasesHaveBarRange.fs (2,5--2,8)),
                   Simple
                     (Enum
                        ([SynEnumCase
                            ([], SynIdent (Bar, None),
                             Const
                               (Int32 1,
-                               /root/MultipleSynEnumCasesHaveBarRange.fs (2,12--2,13)),
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/MultipleSynEnumCasesHaveBarRange.fs (2,6--2,13),
+                               /root/MultipleSynEnumCasesHaveBarRange.fs (3,12--3,13)),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/MultipleSynEnumCasesHaveBarRange.fs (3,6--3,13),
                             { BarRange =
                                Some
-                                 /root/MultipleSynEnumCasesHaveBarRange.fs (2,4--2,5)
+                                 /root/MultipleSynEnumCasesHaveBarRange.fs (3,4--3,5)
                               EqualsRange =
-                               /root/MultipleSynEnumCasesHaveBarRange.fs (2,10--2,11) });
+                               /root/MultipleSynEnumCasesHaveBarRange.fs (3,10--3,11) });
                          SynEnumCase
                            ([], SynIdent (Bear, None),
                             Const
                               (Int32 2,
-                               /root/MultipleSynEnumCasesHaveBarRange.fs (3,13--3,14)),
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/MultipleSynEnumCasesHaveBarRange.fs (3,6--3,14),
+                               /root/MultipleSynEnumCasesHaveBarRange.fs (4,13--4,14)),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/MultipleSynEnumCasesHaveBarRange.fs (4,6--4,14),
                             { BarRange =
                                Some
-                                 /root/MultipleSynEnumCasesHaveBarRange.fs (3,4--3,5)
+                                 /root/MultipleSynEnumCasesHaveBarRange.fs (4,4--4,5)
                               EqualsRange =
-                               /root/MultipleSynEnumCasesHaveBarRange.fs (3,11--3,12) })],
-                        /root/MultipleSynEnumCasesHaveBarRange.fs (2,4--3,14)),
-                     /root/MultipleSynEnumCasesHaveBarRange.fs (2,4--3,14)), [],
-                  None, /root/MultipleSynEnumCasesHaveBarRange.fs (1,5--3,14),
+                               /root/MultipleSynEnumCasesHaveBarRange.fs (4,11--4,12) })],
+                        /root/MultipleSynEnumCasesHaveBarRange.fs (3,4--4,14)),
+                     /root/MultipleSynEnumCasesHaveBarRange.fs (3,4--4,14)), [],
+                  None, /root/MultipleSynEnumCasesHaveBarRange.fs (2,5--4,14),
                   { LeadingKeyword =
-                     Type /root/MultipleSynEnumCasesHaveBarRange.fs (1,0--1,4)
+                     Type /root/MultipleSynEnumCasesHaveBarRange.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/MultipleSynEnumCasesHaveBarRange.fs (1,9--1,10)
+                     Some /root/MultipleSynEnumCasesHaveBarRange.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/MultipleSynEnumCasesHaveBarRange.fs (1,0--3,14))],
+              /root/MultipleSynEnumCasesHaveBarRange.fs (2,0--4,14))],
           PreXmlDocEmpty, [], None,
-          /root/MultipleSynEnumCasesHaveBarRange.fs (1,0--3,14),
+          /root/MultipleSynEnumCasesHaveBarRange.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs b/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs
index 20561af436c..244d7667c9e 100644
--- a/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs
+++ b/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs
@@ -1,6 +1,7 @@
+
 async {
     let! bar = getBar ()
     and! foo = getFoo () in
     and! meh = getMeh ()
     return bar
-}
\ No newline at end of file
+}
diff --git a/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs.bsl
index d57a3486ac6..e67ad8c092d 100644
--- a/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs.bsl
+++ b/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs.bsl
@@ -15,65 +15,65 @@ ImplFile
                    (false,
                     LetOrUseBang
                       (Yes
-                         /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,4--2,24),
+                         /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,4--3,24),
                        false, true,
                        Named
                          (SynIdent (bar, None), false, None,
-                          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,9--2,12)),
+                          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,9--3,12)),
                        App
                          (NonAtomic, false, Ident getBar,
                           Const
                             (Unit,
-                             /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,22--2,24)),
-                          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,15--2,24)),
+                             /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,22--3,24)),
+                          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,15--3,24)),
                        [SynExprAndBang
                           (Yes
-                             /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,4--3,27),
+                             /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,4--4,27),
                            false, true,
                            Named
                              (SynIdent (foo, None), false, None,
-                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,9--3,12)),
+                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,9--4,12)),
                            App
                              (NonAtomic, false, Ident getFoo,
                               Const
                                 (Unit,
-                                 /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,22--3,24)),
-                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,15--3,24)),
-                           /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,4--3,24),
+                                 /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,22--4,24)),
+                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,15--4,24)),
+                           /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,4--4,24),
                            { EqualsRange =
-                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,13--3,14)
+                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,13--4,14)
                              InKeyword =
                               Some
-                                /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,25--3,27) });
+                                /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,25--4,27) });
                         SynExprAndBang
                           (Yes
-                             /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,4--5,10),
+                             /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,4--6,10),
                            false, true,
                            Named
                              (SynIdent (meh, None), false, None,
-                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,9--4,12)),
+                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,9--5,12)),
                            App
                              (NonAtomic, false, Ident getMeh,
                               Const
                                 (Unit,
-                                 /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,22--4,24)),
-                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,15--4,24)),
-                           /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,4--4,24),
+                                 /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,22--5,24)),
+                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,15--5,24)),
+                           /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,4--5,24),
                            { EqualsRange =
-                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,13--4,14)
+                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,13--5,14)
                              InKeyword = None })],
                        YieldOrReturn
                          ((false, true), Ident bar,
-                          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,4--5,14)),
-                       /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,4--5,14),
+                          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (6,4--6,14)),
+                       /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,4--6,14),
                        { EqualsRange =
                           Some
-                            /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,13--2,14) }),
-                    /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (1,6--6,1)),
-                 /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (1,0--6,1)),
-              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (1,0--6,1))],
+                            /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,13--3,14) }),
+                    /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,6--7,1)),
+                 /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,0--7,1)),
+              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,0--7,1))],
           PreXmlDocEmpty, [], None,
-          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (1,0--6,1),
+          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,0--7,1),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs b/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs
index e03a60ba750..8b96dad0af8 100644
--- a/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs
+++ b/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs
@@ -1,3 +1,4 @@
+
 type Foo =
     | Bar of string
-    | Bear of int
\ No newline at end of file
+    | Bear of int
diff --git a/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs.bsl b/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs.bsl
index a0a700d6c46..ad7160fe3f6 100644
--- a/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/MultipleSynUnionCasesHaveBarRange.fs (1,5--1,8)),
+                     /root/MultipleSynUnionCasesHaveBarRange.fs (2,5--2,8)),
                   Simple
                     (Union
                        (None,
@@ -21,16 +21,16 @@ ImplFile
                                  ([], false, None,
                                   LongIdent
                                     (SynLongIdent ([string], [], [None])), false,
-                                  PreXmlDoc ((2,13), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((3,13), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/MultipleSynUnionCasesHaveBarRange.fs (2,13--2,19),
+                                  /root/MultipleSynUnionCasesHaveBarRange.fs (3,13--3,19),
                                   { LeadingKeyword = None })],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/MultipleSynUnionCasesHaveBarRange.fs (2,6--2,19),
+                            /root/MultipleSynUnionCasesHaveBarRange.fs (3,6--3,19),
                             { BarRange =
                                Some
-                                 /root/MultipleSynUnionCasesHaveBarRange.fs (2,4--2,5) });
+                                 /root/MultipleSynUnionCasesHaveBarRange.fs (3,4--3,5) });
                          SynUnionCase
                            ([], SynIdent (Bear, None),
                             Fields
@@ -38,27 +38,27 @@ ImplFile
                                  ([], false, None,
                                   LongIdent (SynLongIdent ([int], [], [None])),
                                   false,
-                                  PreXmlDoc ((3,14), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((4,14), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/MultipleSynUnionCasesHaveBarRange.fs (3,14--3,17),
+                                  /root/MultipleSynUnionCasesHaveBarRange.fs (4,14--4,17),
                                   { LeadingKeyword = None })],
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/MultipleSynUnionCasesHaveBarRange.fs (3,6--3,17),
+                            /root/MultipleSynUnionCasesHaveBarRange.fs (4,6--4,17),
                             { BarRange =
                                Some
-                                 /root/MultipleSynUnionCasesHaveBarRange.fs (3,4--3,5) })],
-                        /root/MultipleSynUnionCasesHaveBarRange.fs (2,4--3,17)),
-                     /root/MultipleSynUnionCasesHaveBarRange.fs (2,4--3,17)), [],
-                  None, /root/MultipleSynUnionCasesHaveBarRange.fs (1,5--3,17),
+                                 /root/MultipleSynUnionCasesHaveBarRange.fs (4,4--4,5) })],
+                        /root/MultipleSynUnionCasesHaveBarRange.fs (3,4--4,17)),
+                     /root/MultipleSynUnionCasesHaveBarRange.fs (3,4--4,17)), [],
+                  None, /root/MultipleSynUnionCasesHaveBarRange.fs (2,5--4,17),
                   { LeadingKeyword =
-                     Type /root/MultipleSynUnionCasesHaveBarRange.fs (1,0--1,4)
+                     Type /root/MultipleSynUnionCasesHaveBarRange.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/MultipleSynUnionCasesHaveBarRange.fs (1,9--1,10)
+                     Some /root/MultipleSynUnionCasesHaveBarRange.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/MultipleSynUnionCasesHaveBarRange.fs (1,0--3,17))],
+              /root/MultipleSynUnionCasesHaveBarRange.fs (2,0--4,17))],
           PreXmlDocEmpty, [], None,
-          /root/MultipleSynUnionCasesHaveBarRange.fs (1,0--3,17),
+          /root/MultipleSynUnionCasesHaveBarRange.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamedParameter.fs b/tests/service/data/SyntaxTree/NamedParameter.fs
index fdd7f9f4a25..b861ab70bae 100644
--- a/tests/service/data/SyntaxTree/NamedParameter.fs
+++ b/tests/service/data/SyntaxTree/NamedParameter.fs
@@ -1 +1,2 @@
-f(x=4)
\ No newline at end of file
+
+f(x=4)
diff --git a/tests/service/data/SyntaxTree/NamedParameter.fs.bsl b/tests/service/data/SyntaxTree/NamedParameter.fs.bsl
index 5c32662c2a3..7ba54fc16f7 100644
--- a/tests/service/data/SyntaxTree/NamedParameter.fs.bsl
+++ b/tests/service/data/SyntaxTree/NamedParameter.fs.bsl
@@ -16,15 +16,15 @@ ImplFile
                             (false,
                              SynLongIdent
                                ([op_Equality], [], [Some (OriginalNotation "=")]),
-                             None, /root/NamedParameter.fs (1,3--1,4)), Ident x,
-                          /root/NamedParameter.fs (1,2--1,4)),
-                       Const (Int32 4, /root/NamedParameter.fs (1,4--1,5)),
-                       /root/NamedParameter.fs (1,2--1,5)),
-                    /root/NamedParameter.fs (1,1--1,2),
-                    Some /root/NamedParameter.fs (1,5--1,6),
-                    /root/NamedParameter.fs (1,1--1,6)),
-                 /root/NamedParameter.fs (1,0--1,6)),
-              /root/NamedParameter.fs (1,0--1,6))], PreXmlDocEmpty, [], None,
-          /root/NamedParameter.fs (1,0--1,6), { LeadingKeyword = None })],
+                             None, /root/NamedParameter.fs (2,3--2,4)), Ident x,
+                          /root/NamedParameter.fs (2,2--2,4)),
+                       Const (Int32 4, /root/NamedParameter.fs (2,4--2,5)),
+                       /root/NamedParameter.fs (2,2--2,5)),
+                    /root/NamedParameter.fs (2,1--2,2),
+                    Some /root/NamedParameter.fs (2,5--2,6),
+                    /root/NamedParameter.fs (2,1--2,6)),
+                 /root/NamedParameter.fs (2,0--2,6)),
+              /root/NamedParameter.fs (2,0--2,6))], PreXmlDocEmpty, [], None,
+          /root/NamedParameter.fs (2,0--2,6), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs b/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs
index 6b04b0262d8..4f5edfc04ed 100644
--- a/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs
+++ b/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs
@@ -1 +1,2 @@
-type Foo = delegate of a: A * b: B -> c:C -> D
\ No newline at end of file
+
+type Foo = delegate of a: A * b: B -> c:C -> D
diff --git a/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs.bsl b/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs.bsl
index b1223dc2fa3..1d67d86d3ca 100644
--- a/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs.bsl
+++ b/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/NamedParametersInDelegateType.fs (1,5--1,8)),
+                     /root/NamedParametersInDelegateType.fs (2,5--2,8)),
                   ObjectModel
                     (Delegate
                        (Fun
@@ -20,27 +20,27 @@ ImplFile
                                  (SignatureParameter
                                     ([], false, Some a,
                                      LongIdent (SynLongIdent ([A], [], [None])),
-                                     /root/NamedParametersInDelegateType.fs (1,23--1,27)));
+                                     /root/NamedParametersInDelegateType.fs (2,23--2,27)));
                                Star
-                                 /root/NamedParametersInDelegateType.fs (1,28--1,29);
+                                 /root/NamedParametersInDelegateType.fs (2,28--2,29);
                                Type
                                  (SignatureParameter
                                     ([], false, Some b,
                                      LongIdent (SynLongIdent ([B], [], [None])),
-                                     /root/NamedParametersInDelegateType.fs (1,30--1,34)))],
-                              /root/NamedParametersInDelegateType.fs (1,23--1,34)),
+                                     /root/NamedParametersInDelegateType.fs (2,30--2,34)))],
+                              /root/NamedParametersInDelegateType.fs (2,23--2,34)),
                            Fun
                              (SignatureParameter
                                 ([], false, Some c,
                                  LongIdent (SynLongIdent ([C], [], [None])),
-                                 /root/NamedParametersInDelegateType.fs (1,38--1,41)),
+                                 /root/NamedParametersInDelegateType.fs (2,38--2,41)),
                               LongIdent (SynLongIdent ([D], [], [None])),
-                              /root/NamedParametersInDelegateType.fs (1,38--1,46),
+                              /root/NamedParametersInDelegateType.fs (2,38--2,46),
                               { ArrowRange =
-                                 /root/NamedParametersInDelegateType.fs (1,42--1,44) }),
-                           /root/NamedParametersInDelegateType.fs (1,23--1,46),
+                                 /root/NamedParametersInDelegateType.fs (2,42--2,44) }),
+                           /root/NamedParametersInDelegateType.fs (2,23--2,46),
                            { ArrowRange =
-                              /root/NamedParametersInDelegateType.fs (1,35--1,37) }),
+                              /root/NamedParametersInDelegateType.fs (2,35--2,37) }),
                         SynValInfo
                           ([[SynArgInfo ([], false, Some a);
                              SynArgInfo ([], false, Some b)];
@@ -58,35 +58,35 @@ ImplFile
                                         ([], false, Some a,
                                          LongIdent
                                            (SynLongIdent ([A], [], [None])),
-                                         /root/NamedParametersInDelegateType.fs (1,23--1,27)));
+                                         /root/NamedParametersInDelegateType.fs (2,23--2,27)));
                                    Star
-                                     /root/NamedParametersInDelegateType.fs (1,28--1,29);
+                                     /root/NamedParametersInDelegateType.fs (2,28--2,29);
                                    Type
                                      (SignatureParameter
                                         ([], false, Some b,
                                          LongIdent
                                            (SynLongIdent ([B], [], [None])),
-                                         /root/NamedParametersInDelegateType.fs (1,30--1,34)))],
-                                  /root/NamedParametersInDelegateType.fs (1,23--1,34)),
+                                         /root/NamedParametersInDelegateType.fs (2,30--2,34)))],
+                                  /root/NamedParametersInDelegateType.fs (2,23--2,34)),
                                Fun
                                  (SignatureParameter
                                     ([], false, Some c,
                                      LongIdent (SynLongIdent ([C], [], [None])),
-                                     /root/NamedParametersInDelegateType.fs (1,38--1,41)),
+                                     /root/NamedParametersInDelegateType.fs (2,38--2,41)),
                                   LongIdent (SynLongIdent ([D], [], [None])),
-                                  /root/NamedParametersInDelegateType.fs (1,38--1,46),
+                                  /root/NamedParametersInDelegateType.fs (2,38--2,46),
                                   { ArrowRange =
-                                     /root/NamedParametersInDelegateType.fs (1,42--1,44) }),
-                               /root/NamedParametersInDelegateType.fs (1,23--1,46),
+                                     /root/NamedParametersInDelegateType.fs (2,42--2,44) }),
+                               /root/NamedParametersInDelegateType.fs (2,23--2,46),
                                { ArrowRange =
-                                  /root/NamedParametersInDelegateType.fs (1,35--1,37) }),
+                                  /root/NamedParametersInDelegateType.fs (2,35--2,37) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, Some a);
                                  SynArgInfo ([], false, Some b)];
                                 [SynArgInfo ([], false, Some c)]],
                                SynArgInfo ([], false, None)), false, false,
                             PreXmlDocEmpty, None, None,
-                            /root/NamedParametersInDelegateType.fs (1,11--1,46),
+                            /root/NamedParametersInDelegateType.fs (2,11--2,46),
                             { LeadingKeyword = Synthetic
                               InlineKeyword = None
                               WithKeyword = None
@@ -97,18 +97,18 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/NamedParametersInDelegateType.fs (1,11--1,46),
+                         /root/NamedParametersInDelegateType.fs (2,11--2,46),
                          { GetSetKeywords = None })],
-                     /root/NamedParametersInDelegateType.fs (1,11--1,46)), [],
-                  None, /root/NamedParametersInDelegateType.fs (1,5--1,46),
+                     /root/NamedParametersInDelegateType.fs (2,11--2,46)), [],
+                  None, /root/NamedParametersInDelegateType.fs (2,5--2,46),
                   { LeadingKeyword =
-                     Type /root/NamedParametersInDelegateType.fs (1,0--1,4)
+                     Type /root/NamedParametersInDelegateType.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/NamedParametersInDelegateType.fs (1,9--1,10)
+                     Some /root/NamedParametersInDelegateType.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/NamedParametersInDelegateType.fs (1,0--1,46))],
+              /root/NamedParametersInDelegateType.fs (2,0--2,46))],
           PreXmlDocEmpty, [], None,
-          /root/NamedParametersInDelegateType.fs (1,0--1,46),
+          /root/NamedParametersInDelegateType.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NameofOperator.fs b/tests/service/data/SyntaxTree/NameofOperator.fs
index 5a7913fb4de..1231ae7d351 100644
--- a/tests/service/data/SyntaxTree/NameofOperator.fs
+++ b/tests/service/data/SyntaxTree/NameofOperator.fs
@@ -1 +1,2 @@
-nameof(+)
\ No newline at end of file
+
+nameof(+)
diff --git a/tests/service/data/SyntaxTree/NameofOperator.fs.bsl b/tests/service/data/SyntaxTree/NameofOperator.fs.bsl
index b2b9dca8f49..610f4eeb513 100644
--- a/tests/service/data/SyntaxTree/NameofOperator.fs.bsl
+++ b/tests/service/data/SyntaxTree/NameofOperator.fs.bsl
@@ -13,11 +13,11 @@ ImplFile
                       ([op_Addition], [],
                        [Some
                           (OriginalNotationWithParen
-                             (/root/NameofOperator.fs (1,6--1,7), "+",
-                              /root/NameofOperator.fs (1,8--1,9)))]), None,
-                    /root/NameofOperator.fs (1,6--1,9)),
-                 /root/NameofOperator.fs (1,0--1,9)),
-              /root/NameofOperator.fs (1,0--1,9))], PreXmlDocEmpty, [], None,
-          /root/NameofOperator.fs (1,0--1,9), { LeadingKeyword = None })],
+                             (/root/NameofOperator.fs (2,6--2,7), "+",
+                              /root/NameofOperator.fs (2,8--2,9)))]), None,
+                    /root/NameofOperator.fs (2,6--2,9)),
+                 /root/NameofOperator.fs (2,0--2,9)),
+              /root/NameofOperator.fs (2,0--2,9))], PreXmlDocEmpty, [], None,
+          /root/NameofOperator.fs (2,0--2,9), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs
index e932efe94f2..5dddd805dea 100644
--- a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs
+++ b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs
@@ -1,3 +1,4 @@
+
 namespace Foo
 module Bar =
-let a = 42
\ No newline at end of file
+let a = 42
diff --git a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs.bsl
index fd480fe3991..e08892d7b34 100644
--- a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs.bsl
@@ -7,46 +7,46 @@ ImplFile
           [NestedModule
              (SynComponentInfo
                 ([], None, [], [Bar],
-                 PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/NamespaceShouldContainNamespaceKeyword.fs (2,0--2,10)),
+                 /root/NamespaceShouldContainNamespaceKeyword.fs (3,0--3,10)),
               false,
               [Let
                  (false,
                   [SynBinding
                      (None, Normal, false, false, [],
-                      PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                       SynValData
                         (None, SynValInfo ([], SynArgInfo ([], false, None)),
                          None),
                       Named
                         (SynIdent (a, None), false, None,
-                         /root/NamespaceShouldContainNamespaceKeyword.fs (3,4--3,5)),
+                         /root/NamespaceShouldContainNamespaceKeyword.fs (4,4--4,5)),
                       None,
                       Const
                         (Int32 42,
-                         /root/NamespaceShouldContainNamespaceKeyword.fs (3,8--3,10)),
-                      /root/NamespaceShouldContainNamespaceKeyword.fs (3,4--3,5),
+                         /root/NamespaceShouldContainNamespaceKeyword.fs (4,8--4,10)),
+                      /root/NamespaceShouldContainNamespaceKeyword.fs (4,4--4,5),
                       Yes
-                        /root/NamespaceShouldContainNamespaceKeyword.fs (3,0--3,10),
+                        /root/NamespaceShouldContainNamespaceKeyword.fs (4,0--4,10),
                       { LeadingKeyword =
                          Let
-                           /root/NamespaceShouldContainNamespaceKeyword.fs (3,0--3,3)
+                           /root/NamespaceShouldContainNamespaceKeyword.fs (4,0--4,3)
                         InlineKeyword = None
                         EqualsRange =
                          Some
-                           /root/NamespaceShouldContainNamespaceKeyword.fs (3,6--3,7) })],
-                  /root/NamespaceShouldContainNamespaceKeyword.fs (3,0--3,10))],
-              false, /root/NamespaceShouldContainNamespaceKeyword.fs (2,0--3,10),
+                           /root/NamespaceShouldContainNamespaceKeyword.fs (4,6--4,7) })],
+                  /root/NamespaceShouldContainNamespaceKeyword.fs (4,0--4,10))],
+              false, /root/NamespaceShouldContainNamespaceKeyword.fs (3,0--4,10),
               { ModuleKeyword =
-                 Some /root/NamespaceShouldContainNamespaceKeyword.fs (2,0--2,6)
+                 Some /root/NamespaceShouldContainNamespaceKeyword.fs (3,0--3,6)
                 EqualsRange =
                  Some
-                   /root/NamespaceShouldContainNamespaceKeyword.fs (2,11--2,12) })],
+                   /root/NamespaceShouldContainNamespaceKeyword.fs (3,11--3,12) })],
           PreXmlDocEmpty, [], None,
-          /root/NamespaceShouldContainNamespaceKeyword.fs (1,0--3,10),
+          /root/NamespaceShouldContainNamespaceKeyword.fs (2,0--4,10),
           { LeadingKeyword =
              Namespace
-               /root/NamespaceShouldContainNamespaceKeyword.fs (1,0--1,9) })],
+               /root/NamespaceShouldContainNamespaceKeyword.fs (2,0--2,9) })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi
index c696b6f03a8..c79ecb70a48 100644
--- a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi
+++ b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi
@@ -1,3 +1,4 @@
+
 namespace Foo
 module Bar =
-val a: int
\ No newline at end of file
+val a: int
diff --git a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi.bsl b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi.bsl
index c36dc2fcf20..ab88d84a929 100644
--- a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi.bsl
@@ -7,36 +7,36 @@ SigFile
           [NestedModule
              (SynComponentInfo
                 ([], None, [], [Bar],
-                 PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/NamespaceShouldContainNamespaceKeyword.fsi (2,0--2,10)),
+                 /root/NamespaceShouldContainNamespaceKeyword.fsi (3,0--3,10)),
               false,
               [Val
                  (SynValSig
                     ([], SynIdent (a, None), SynValTyparDecls (None, true),
                      LongIdent (SynLongIdent ([int], [], [None])),
                      SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      None, None,
-                     /root/NamespaceShouldContainNamespaceKeyword.fsi (3,0--3,10),
+                     /root/NamespaceShouldContainNamespaceKeyword.fsi (4,0--4,10),
                      { LeadingKeyword =
                         Val
-                          /root/NamespaceShouldContainNamespaceKeyword.fsi (3,0--3,3)
+                          /root/NamespaceShouldContainNamespaceKeyword.fsi (4,0--4,3)
                        InlineKeyword = None
                        WithKeyword = None
                        EqualsRange = None }),
-                  /root/NamespaceShouldContainNamespaceKeyword.fsi (3,0--3,10))],
-              /root/NamespaceShouldContainNamespaceKeyword.fsi (2,0--3,10),
+                  /root/NamespaceShouldContainNamespaceKeyword.fsi (4,0--4,10))],
+              /root/NamespaceShouldContainNamespaceKeyword.fsi (3,0--4,10),
               { ModuleKeyword =
                  Some
-                   /root/NamespaceShouldContainNamespaceKeyword.fsi (2,0--2,6)
+                   /root/NamespaceShouldContainNamespaceKeyword.fsi (3,0--3,6)
                 EqualsRange =
                  Some
-                   /root/NamespaceShouldContainNamespaceKeyword.fsi (2,11--2,12) })],
+                   /root/NamespaceShouldContainNamespaceKeyword.fsi (3,11--3,12) })],
           PreXmlDocEmpty, [], None,
-          /root/NamespaceShouldContainNamespaceKeyword.fsi (1,0--3,10),
+          /root/NamespaceShouldContainNamespaceKeyword.fsi (2,0--4,10),
           { LeadingKeyword =
              Namespace
-               /root/NamespaceShouldContainNamespaceKeyword.fsi (1,0--1,9) })],
+               /root/NamespaceShouldContainNamespaceKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs b/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs
index b76eb5211f5..cd752c0d137 100644
--- a/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs
+++ b/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs
@@ -1,3 +1,4 @@
+
 if a then
 b
-elif c then d
\ No newline at end of file
+elif c then d
diff --git a/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs.bsl
index e25344bd825..85eb7b25f98 100644
--- a/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs.bsl
+++ b/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs.bsl
@@ -10,24 +10,24 @@ ImplFile
                  Some
                    (IfThenElse
                       (Ident c, Ident d, None,
-                       Yes /root/NestedElifInIfThenElse.fs (3,0--3,11), false,
-                       /root/NestedElifInIfThenElse.fs (3,0--3,13),
-                       { IfKeyword = /root/NestedElifInIfThenElse.fs (3,0--3,4)
+                       Yes /root/NestedElifInIfThenElse.fs (4,0--4,11), false,
+                       /root/NestedElifInIfThenElse.fs (4,0--4,13),
+                       { IfKeyword = /root/NestedElifInIfThenElse.fs (4,0--4,4)
                          IsElif = true
                          ThenKeyword =
-                          /root/NestedElifInIfThenElse.fs (3,7--3,11)
+                          /root/NestedElifInIfThenElse.fs (4,7--4,11)
                          ElseKeyword = None
                          IfToThenRange =
-                          /root/NestedElifInIfThenElse.fs (3,0--3,11) })),
-                 Yes /root/NestedElifInIfThenElse.fs (1,0--1,9), false,
-                 /root/NestedElifInIfThenElse.fs (1,0--3,13),
-                 { IfKeyword = /root/NestedElifInIfThenElse.fs (1,0--1,2)
+                          /root/NestedElifInIfThenElse.fs (4,0--4,11) })),
+                 Yes /root/NestedElifInIfThenElse.fs (2,0--2,9), false,
+                 /root/NestedElifInIfThenElse.fs (2,0--4,13),
+                 { IfKeyword = /root/NestedElifInIfThenElse.fs (2,0--2,2)
                    IsElif = false
-                   ThenKeyword = /root/NestedElifInIfThenElse.fs (1,5--1,9)
+                   ThenKeyword = /root/NestedElifInIfThenElse.fs (2,5--2,9)
                    ElseKeyword = None
-                   IfToThenRange = /root/NestedElifInIfThenElse.fs (1,0--1,9) }),
-              /root/NestedElifInIfThenElse.fs (1,0--3,13))], PreXmlDocEmpty, [],
-          None, /root/NestedElifInIfThenElse.fs (1,0--3,13),
+                   IfToThenRange = /root/NestedElifInIfThenElse.fs (2,0--2,9) }),
+              /root/NestedElifInIfThenElse.fs (2,0--4,13))], PreXmlDocEmpty, [],
+          None, /root/NestedElifInIfThenElse.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs b/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs
index bc0923bc492..47b75748eca 100644
--- a/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs
+++ b/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs
@@ -1,4 +1,5 @@
+
 if a then
     b
 else
-    if c then d
\ No newline at end of file
+    if c then d
diff --git a/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs.bsl
index caaed8e14e4..6d7a2363f81 100644
--- a/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs.bsl
+++ b/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs.bsl
@@ -10,26 +10,26 @@ ImplFile
                  Some
                    (IfThenElse
                       (Ident c, Ident d, None,
-                       Yes /root/NestedElseIfInIfThenElse.fs (4,4--4,13), false,
-                       /root/NestedElseIfInIfThenElse.fs (4,4--4,15),
+                       Yes /root/NestedElseIfInIfThenElse.fs (5,4--5,13), false,
+                       /root/NestedElseIfInIfThenElse.fs (5,4--5,15),
                        { IfKeyword =
-                          /root/NestedElseIfInIfThenElse.fs (4,4--4,6)
+                          /root/NestedElseIfInIfThenElse.fs (5,4--5,6)
                          IsElif = false
                          ThenKeyword =
-                          /root/NestedElseIfInIfThenElse.fs (4,9--4,13)
+                          /root/NestedElseIfInIfThenElse.fs (5,9--5,13)
                          ElseKeyword = None
                          IfToThenRange =
-                          /root/NestedElseIfInIfThenElse.fs (4,4--4,13) })),
-                 Yes /root/NestedElseIfInIfThenElse.fs (1,0--1,9), false,
-                 /root/NestedElseIfInIfThenElse.fs (1,0--4,15),
-                 { IfKeyword = /root/NestedElseIfInIfThenElse.fs (1,0--1,2)
+                          /root/NestedElseIfInIfThenElse.fs (5,4--5,13) })),
+                 Yes /root/NestedElseIfInIfThenElse.fs (2,0--2,9), false,
+                 /root/NestedElseIfInIfThenElse.fs (2,0--5,15),
+                 { IfKeyword = /root/NestedElseIfInIfThenElse.fs (2,0--2,2)
                    IsElif = false
-                   ThenKeyword = /root/NestedElseIfInIfThenElse.fs (1,5--1,9)
+                   ThenKeyword = /root/NestedElseIfInIfThenElse.fs (2,5--2,9)
                    ElseKeyword =
-                    Some /root/NestedElseIfInIfThenElse.fs (3,0--3,4)
-                   IfToThenRange = /root/NestedElseIfInIfThenElse.fs (1,0--1,9) }),
-              /root/NestedElseIfInIfThenElse.fs (1,0--4,15))], PreXmlDocEmpty,
-          [], None, /root/NestedElseIfInIfThenElse.fs (1,0--4,15),
+                    Some /root/NestedElseIfInIfThenElse.fs (4,0--4,4)
+                   IfToThenRange = /root/NestedElseIfInIfThenElse.fs (2,0--2,9) }),
+              /root/NestedElseIfInIfThenElse.fs (2,0--5,15))], PreXmlDocEmpty,
+          [], None, /root/NestedElseIfInIfThenElse.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs b/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs
index e9abdb6f804..6ac44563cbb 100644
--- a/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs
+++ b/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs
@@ -1,4 +1,5 @@
+
 if a then
 b
 else if c then
-d
\ No newline at end of file
+d
diff --git a/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
index b8c3a866b2b..920dc323e71 100644
--- a/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
+++ b/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
@@ -11,33 +11,33 @@ ImplFile
                    (IfThenElse
                       (Ident c, Ident d, None,
                        Yes
-                         /root/NestedElseIfOnTheSameLineInIfThenElse.fs (3,5--3,14),
+                         /root/NestedElseIfOnTheSameLineInIfThenElse.fs (4,5--4,14),
                        false,
-                       /root/NestedElseIfOnTheSameLineInIfThenElse.fs (3,5--4,1),
+                       /root/NestedElseIfOnTheSameLineInIfThenElse.fs (4,5--5,1),
                        { IfKeyword =
-                          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (3,5--3,7)
+                          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (4,5--4,7)
                          IsElif = false
                          ThenKeyword =
-                          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (3,10--3,14)
+                          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (4,10--4,14)
                          ElseKeyword = None
                          IfToThenRange =
-                          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (3,5--3,14) })),
-                 Yes /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,0--1,9),
+                          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (4,5--4,14) })),
+                 Yes /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--2,9),
                  false,
-                 /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,0--4,1),
+                 /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--5,1),
                  { IfKeyword =
-                    /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,0--1,2)
+                    /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--2,2)
                    IsElif = false
                    ThenKeyword =
-                    /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,5--1,9)
+                    /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,5--2,9)
                    ElseKeyword =
                     Some
-                      /root/NestedElseIfOnTheSameLineInIfThenElse.fs (3,0--3,4)
+                      /root/NestedElseIfOnTheSameLineInIfThenElse.fs (4,0--4,4)
                    IfToThenRange =
-                    /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,0--1,9) }),
-              /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,0--4,1))],
+                    /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--2,9) }),
+              /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--5,1))],
           PreXmlDocEmpty, [], None,
-          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (1,0--4,1),
+          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi b/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi
index ccee94ac65e..d8241db92e9 100644
--- a/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi
+++ b/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi
@@ -1,3 +1,4 @@
+
 namespace Foobar
 
 val v : int =
@@ -9,4 +10,4 @@ val v : int =
         #endif
     #else
         3
-    #endif
\ No newline at end of file
+    #endif
diff --git a/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi.bsl
index 61daf267fbf..490464fd944 100644
--- a/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi.bsl
@@ -9,30 +9,30 @@ SigFile
                 ([], SynIdent (v, None), SynValTyparDecls (None, true),
                  LongIdent (SynLongIdent ([int], [], [None])),
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
                  Some
                    (Const
                       (Int32 3,
-                       /root/NestedIfElseEndif,SignatureFile.fsi (11,8--11,9))),
-                 /root/NestedIfElseEndif,SignatureFile.fsi (3,0--11,9),
+                       /root/NestedIfElseEndif,SignatureFile.fsi (12,8--12,9))),
+                 /root/NestedIfElseEndif,SignatureFile.fsi (4,0--12,9),
                  { LeadingKeyword =
-                    Val /root/NestedIfElseEndif,SignatureFile.fsi (3,0--3,3)
+                    Val /root/NestedIfElseEndif,SignatureFile.fsi (4,0--4,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange =
-                    Some /root/NestedIfElseEndif,SignatureFile.fsi (3,12--3,13) }),
-              /root/NestedIfElseEndif,SignatureFile.fsi (3,0--11,9))],
+                    Some /root/NestedIfElseEndif,SignatureFile.fsi (4,12--4,13) }),
+              /root/NestedIfElseEndif,SignatureFile.fsi (4,0--12,9))],
           PreXmlDocEmpty, [], None,
-          /root/NestedIfElseEndif,SignatureFile.fsi (1,0--11,9),
+          /root/NestedIfElseEndif,SignatureFile.fsi (2,0--12,9),
           { LeadingKeyword =
-             Namespace /root/NestedIfElseEndif,SignatureFile.fsi (1,0--1,9) })],
+             Namespace /root/NestedIfElseEndif,SignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives =
          [If
-            (Ident "FOO", /root/NestedIfElseEndif,SignatureFile.fsi (4,4--4,11));
+            (Ident "FOO", /root/NestedIfElseEndif,SignatureFile.fsi (5,4--5,11));
           If
-            (Ident "MEH", /root/NestedIfElseEndif,SignatureFile.fsi (5,8--5,15));
-          Else /root/NestedIfElseEndif,SignatureFile.fsi (7,8--7,13);
-          EndIf /root/NestedIfElseEndif,SignatureFile.fsi (9,8--9,14);
-          Else /root/NestedIfElseEndif,SignatureFile.fsi (10,4--10,9);
-          EndIf /root/NestedIfElseEndif,SignatureFile.fsi (12,4--12,10)]
+            (Ident "MEH", /root/NestedIfElseEndif,SignatureFile.fsi (6,8--6,15));
+          Else /root/NestedIfElseEndif,SignatureFile.fsi (8,8--8,13);
+          EndIf /root/NestedIfElseEndif,SignatureFile.fsi (10,8--10,14);
+          Else /root/NestedIfElseEndif,SignatureFile.fsi (11,4--11,9);
+          EndIf /root/NestedIfElseEndif,SignatureFile.fsi (13,4--13,10)]
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfElseEndif.fs b/tests/service/data/SyntaxTree/NestedIfElseEndif.fs
index dddff55d076..9e126b9aeb4 100644
--- a/tests/service/data/SyntaxTree/NestedIfElseEndif.fs
+++ b/tests/service/data/SyntaxTree/NestedIfElseEndif.fs
@@ -1,3 +1,4 @@
+
 let v =
     #if FOO
         #if MEH
@@ -7,4 +8,4 @@ let v =
         #endif
     #else
         3
-    #endif
\ No newline at end of file
+    #endif
diff --git a/tests/service/data/SyntaxTree/NestedIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/NestedIfElseEndif.fs.bsl
index 6d20d0beb3d..8c479e59458 100644
--- a/tests/service/data/SyntaxTree/NestedIfElseEndif.fs.bsl
+++ b/tests/service/data/SyntaxTree/NestedIfElseEndif.fs.bsl
@@ -8,26 +8,26 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (v, None), false, None,
-                     /root/NestedIfElseEndif.fs (1,4--1,5)), None,
-                  Const (Int32 3, /root/NestedIfElseEndif.fs (9,8--9,9)),
-                  /root/NestedIfElseEndif.fs (1,4--1,5),
-                  Yes /root/NestedIfElseEndif.fs (1,0--9,9),
-                  { LeadingKeyword = Let /root/NestedIfElseEndif.fs (1,0--1,3)
+                     /root/NestedIfElseEndif.fs (2,4--2,5)), None,
+                  Const (Int32 3, /root/NestedIfElseEndif.fs (10,8--10,9)),
+                  /root/NestedIfElseEndif.fs (2,4--2,5),
+                  Yes /root/NestedIfElseEndif.fs (2,0--10,9),
+                  { LeadingKeyword = Let /root/NestedIfElseEndif.fs (2,0--2,3)
                     InlineKeyword = None
-                    EqualsRange = Some /root/NestedIfElseEndif.fs (1,6--1,7) })],
-              /root/NestedIfElseEndif.fs (1,0--9,9))], PreXmlDocEmpty, [], None,
-          /root/NestedIfElseEndif.fs (1,0--10,10), { LeadingKeyword = None })],
+                    EqualsRange = Some /root/NestedIfElseEndif.fs (2,6--2,7) })],
+              /root/NestedIfElseEndif.fs (2,0--10,9))], PreXmlDocEmpty, [], None,
+          /root/NestedIfElseEndif.fs (2,0--12,0), { LeadingKeyword = None })],
       (true, false),
       { ConditionalDirectives =
-         [If (Ident "FOO", /root/NestedIfElseEndif.fs (2,4--2,11));
-          If (Ident "MEH", /root/NestedIfElseEndif.fs (3,8--3,15));
-          Else /root/NestedIfElseEndif.fs (5,8--5,13);
-          EndIf /root/NestedIfElseEndif.fs (7,8--7,14);
-          Else /root/NestedIfElseEndif.fs (8,4--8,9);
-          EndIf /root/NestedIfElseEndif.fs (10,4--10,10)]
+         [If (Ident "FOO", /root/NestedIfElseEndif.fs (3,4--3,11));
+          If (Ident "MEH", /root/NestedIfElseEndif.fs (4,8--4,15));
+          Else /root/NestedIfElseEndif.fs (6,8--6,13);
+          EndIf /root/NestedIfElseEndif.fs (8,8--8,14);
+          Else /root/NestedIfElseEndif.fs (9,4--9,9);
+          EndIf /root/NestedIfElseEndif.fs (11,4--11,10)]
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi
index 660a05cefca..c6b0bc364fc 100644
--- a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi
+++ b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi
@@ -1,3 +1,4 @@
+
 namespace Foobar
 
 val v : int =
@@ -8,4 +9,4 @@ val v : int =
             #endif
         #endif
     #endif
-    10
\ No newline at end of file
+    10
diff --git a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi.bsl
index b7288788236..18db4131920 100644
--- a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi.bsl
@@ -10,40 +10,40 @@ SigFile
                 ([], SynIdent (v, None), SynValTyparDecls (None, true),
                  LongIdent (SynLongIdent ([int], [], [None])),
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
                  Some
                    (Const
                       (Int32 10,
-                       /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (11,4--11,6))),
-                 /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (3,0--11,6),
+                       /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (12,4--12,6))),
+                 /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (4,0--12,6),
                  { LeadingKeyword =
                     Val
-                      /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (3,0--3,3)
+                      /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (4,0--4,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange =
                     Some
-                      /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (3,12--3,13) }),
-              /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (3,0--11,6))],
+                      /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (4,12--4,13) }),
+              /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (4,0--12,6))],
           PreXmlDocEmpty, [], None,
-          /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (1,0--11,6),
+          /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (2,0--12,6),
           { LeadingKeyword =
              Namespace
-               /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (1,0--1,9) })],
+               /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives =
          [If
             (Not (Ident "DEBUG"),
-             /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (4,4--4,14));
+             /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (5,4--5,14));
           If
             (And (Ident "FOO", Ident "BAR"),
-             /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (5,8--5,22));
+             /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (6,8--6,22));
           If
             (Or (Ident "MEH", Ident "HMM"),
-             /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (6,12--6,26));
+             /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (7,12--7,26));
           EndIf
-            /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (8,12--8,18);
+            /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (9,12--9,18);
           EndIf
-            /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (9,8--9,14);
+            /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (10,8--10,14);
           EndIf
-            /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (10,4--10,10)]
+            /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (11,4--11,10)]
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs
index f5d2aadc865..8956a10e867 100644
--- a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs
+++ b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs
@@ -1,3 +1,4 @@
+
 let v =
     #if !DEBUG
         #if FOO && BAR
@@ -5,4 +6,4 @@ let v =
                 printfn "oh some logging"
             #endif
         #endif
-    #endif
\ No newline at end of file
+    #endif
diff --git a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs.bsl b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs.bsl
index 9995dcf10cc..45231e75822 100644
--- a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs.bsl
+++ b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs.bsl
@@ -8,39 +8,39 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (v, None), false, None,
-                     /root/NestedIfEndifWithComplexExpressions.fs (1,4--1,5)),
+                     /root/NestedIfEndifWithComplexExpressions.fs (2,4--2,5)),
                   None,
                   ArbitraryAfterError
                     ("localBinding1",
-                     /root/NestedIfEndifWithComplexExpressions.fs (1,7--1,7)),
-                  /root/NestedIfEndifWithComplexExpressions.fs (1,4--1,5),
-                  Yes /root/NestedIfEndifWithComplexExpressions.fs (1,4--1,7),
+                     /root/NestedIfEndifWithComplexExpressions.fs (2,7--2,7)),
+                  /root/NestedIfEndifWithComplexExpressions.fs (2,4--2,5),
+                  Yes /root/NestedIfEndifWithComplexExpressions.fs (2,4--2,7),
                   { LeadingKeyword =
-                     Let /root/NestedIfEndifWithComplexExpressions.fs (1,0--1,3)
+                     Let /root/NestedIfEndifWithComplexExpressions.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/NestedIfEndifWithComplexExpressions.fs (1,6--1,7) })],
-              /root/NestedIfEndifWithComplexExpressions.fs (1,0--1,7))],
+                       /root/NestedIfEndifWithComplexExpressions.fs (2,6--2,7) })],
+              /root/NestedIfEndifWithComplexExpressions.fs (2,0--2,7))],
           PreXmlDocEmpty, [], None,
-          /root/NestedIfEndifWithComplexExpressions.fs (1,0--8,10),
+          /root/NestedIfEndifWithComplexExpressions.fs (2,0--10,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives =
          [If
             (Not (Ident "DEBUG"),
-             /root/NestedIfEndifWithComplexExpressions.fs (2,4--2,14));
+             /root/NestedIfEndifWithComplexExpressions.fs (3,4--3,14));
           If
             (And (Ident "FOO", Ident "BAR"),
-             /root/NestedIfEndifWithComplexExpressions.fs (3,8--3,22));
+             /root/NestedIfEndifWithComplexExpressions.fs (4,8--4,22));
           If
             (Or (Ident "MEH", Ident "HMM"),
-             /root/NestedIfEndifWithComplexExpressions.fs (4,12--4,26));
-          EndIf /root/NestedIfEndifWithComplexExpressions.fs (6,12--6,18);
-          EndIf /root/NestedIfEndifWithComplexExpressions.fs (7,8--7,14);
-          EndIf /root/NestedIfEndifWithComplexExpressions.fs (8,4--8,10)]
+             /root/NestedIfEndifWithComplexExpressions.fs (5,12--5,26));
+          EndIf /root/NestedIfEndifWithComplexExpressions.fs (7,12--7,18);
+          EndIf /root/NestedIfEndifWithComplexExpressions.fs (8,8--8,14);
+          EndIf /root/NestedIfEndifWithComplexExpressions.fs (9,4--9,10)]
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs
index ca1977607d7..c4c36399b74 100644
--- a/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs
+++ b/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs
@@ -1,4 +1,5 @@
+
 let f () =
     let x = 1 in // the "in" keyword is available in F#
     let y = 2 in
-    x + y
\ No newline at end of file
+    x + y
diff --git a/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
index 013f160709c..89450488be1 100644
--- a/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
@@ -9,7 +9,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None),
                   LongIdent
@@ -18,62 +18,62 @@ ImplFile
                        [Paren
                           (Const
                              (Unit,
-                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,6--1,8)),
-                           /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,6--1,8))],
+                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,6--2,8)),
+                           /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,6--2,8))],
                      None,
-                     /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,4--1,8)),
+                     /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,8)),
                   None,
                   LetOrUse
                     (false, false,
                      [SynBinding
                         (None, Normal, false, false, [],
-                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          SynValData
                            (None, SynValInfo ([], SynArgInfo ([], false, None)),
                             None),
                          Named
                            (SynIdent (x, None), false, None,
-                            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,8--2,9)),
+                            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,8--3,9)),
                          None,
                          Const
                            (Int32 1,
-                            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,12--2,13)),
-                         /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,8--2,9),
+                            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,12--3,13)),
+                         /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,8--3,9),
                          Yes
-                           /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,13),
+                           /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--3,13),
                          { LeadingKeyword =
                             Let
-                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,7)
+                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--3,7)
                            InlineKeyword = None
                            EqualsRange =
                             Some
-                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,10--2,11) })],
+                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,10--3,11) })],
                      LetOrUse
                        (false, false,
                         [SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (None,
                                SynValInfo ([], SynArgInfo ([], false, None)),
                                None),
                             Named
                               (SynIdent (y, None), false, None,
-                               /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,8--3,9)),
+                               /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,8--4,9)),
                             None,
                             Const
                               (Int32 2,
-                               /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,12--3,13)),
-                            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,8--3,9),
+                               /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,12--4,13)),
+                            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,8--4,9),
                             Yes
-                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--3,13),
+                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,4--4,13),
                             { LeadingKeyword =
                                Let
-                                 /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--3,7)
+                                 /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,4--4,7)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,10--3,11) })],
+                                 /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,10--4,11) })],
                         App
                           (NonAtomic, false,
                            App
@@ -83,34 +83,34 @@ ImplFile
                                  SynLongIdent
                                    ([op_Addition], [],
                                     [Some (OriginalNotation "+")]), None,
-                                 /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,6--4,7)),
+                                 /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (5,6--5,7)),
                               Ident x,
-                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,4--4,7)),
+                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (5,4--5,7)),
                            Ident y,
-                           /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,4--4,9)),
-                        /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--4,9),
+                           /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (5,4--5,9)),
+                        /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,4--5,9),
                         { InKeyword =
                            Some
-                             /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,14--3,16) }),
-                     /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--4,9),
+                             /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,14--4,16) }),
+                     /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--5,9),
                      { InKeyword =
                         Some
-                          /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,14--2,16) }),
-                  /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,4--1,8),
+                          /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,14--3,16) }),
+                  /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,8),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--1,3)
+                       /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,9--1,10) })],
-              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--4,9))],
+                       /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,9--2,10) })],
+              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--5,9))],
           PreXmlDocEmpty, [], None,
-          /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--4,9),
+          /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,17--2,55)] },
+            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,17--3,55)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs b/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs
index d92dc80cc9e..f3b233289bd 100644
--- a/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs
+++ b/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs
@@ -1 +1,2 @@
-let inline (!!) (x: ^a * ^b) : ^c = ((^a or ^b or ^c): (static member op_Implicit: ^a * ^b -> ^c) x)
\ No newline at end of file
+
+let inline (!!) (x: ^a * ^b) : ^c = ((^a or ^b or ^c): (static member op_Implicit: ^a * ^b -> ^c) x)
diff --git a/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
index fe8523da2d2..29cb3c8ff04 100644
--- a/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
+++ b/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, true, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -19,43 +19,43 @@ ImplFile
                        ([op_BangBang], [],
                         [Some
                            (OriginalNotationWithParen
-                              (/root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,11--1,12),
+                              (/root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,11--2,12),
                                "!!",
-                               /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,14--1,15)))]),
+                               /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,14--2,15)))]),
                      None, None,
                      Pats
                        [Paren
                           (Typed
                              (Named
                                 (SynIdent (x, None), false, None,
-                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,17--1,18)),
+                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,17--2,18)),
                               Tuple
                                 (false,
                                  [Type
                                     (Var
                                        (SynTypar (a, HeadType, false),
-                                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,20--1,22)));
+                                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,20--2,22)));
                                   Star
-                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,23--1,24);
+                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,23--2,24);
                                   Type
                                     (Var
                                        (SynTypar (b, HeadType, false),
-                                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,25--1,27)))],
-                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,20--1,27)),
-                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,17--1,27)),
-                           /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,16--1,28))],
+                                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,25--2,27)))],
+                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,20--2,27)),
+                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,17--2,27)),
+                           /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,16--2,28))],
                      None,
-                     /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,11--1,28)),
+                     /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,11--2,28)),
                   Some
                     (SynBindingReturnInfo
                        (Var
                           (SynTypar (c, HeadType, false),
-                           /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,31--1,33)),
-                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,31--1,33),
+                           /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,31--2,33)),
+                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,31--2,33),
                         [],
                         { ColonRange =
                            Some
-                             /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,29--1,30) })),
+                             /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,29--2,30) })),
                   Typed
                     (Paren
                        (TraitCall
@@ -64,20 +64,20 @@ ImplFile
                                 (Or
                                    (Var
                                       (SynTypar (a, HeadType, false),
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,38--1,40)),
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,38--2,40)),
                                     Var
                                       (SynTypar (b, HeadType, false),
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,44--1,46)),
-                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,38--1,46),
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,44--2,46)),
+                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,38--2,46),
                                     { OrKeyword =
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,41--1,43) }),
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,41--2,43) }),
                                  Var
                                    (SynTypar (c, HeadType, false),
-                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,50--1,52)),
-                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,38--1,52),
+                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,50--2,52)),
+                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,38--2,52),
                                  { OrKeyword =
-                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,47--1,49) }),
-                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,37--1,53)),
+                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,47--2,49) }),
+                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,37--2,53)),
                            Member
                              (SynValSig
                                 ([], SynIdent (op_Implicit, None),
@@ -88,31 +88,31 @@ ImplFile
                                        [Type
                                           (Var
                                              (SynTypar (a, HeadType, false),
-                                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,83--1,85)));
+                                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,83--2,85)));
                                         Star
-                                          /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,86--1,87);
+                                          /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,86--2,87);
                                         Type
                                           (Var
                                              (SynTypar (b, HeadType, false),
-                                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,88--1,90)))],
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,83--1,90)),
+                                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,88--2,90)))],
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,83--2,90)),
                                     Var
                                       (SynTypar (c, HeadType, false),
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,94--1,96)),
-                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,83--1,96),
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,94--2,96)),
+                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,83--2,96),
                                     { ArrowRange =
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,91--1,93) }),
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,91--2,93) }),
                                  SynValInfo
                                    ([[SynArgInfo ([], false, None);
                                       SynArgInfo ([], false, None)]],
                                     SynArgInfo ([], false, None)), false, false,
-                                 PreXmlDoc ((1,56), FSharp.Compiler.Xml.XmlDocCollector),
+                                 PreXmlDoc ((2,56), FSharp.Compiler.Xml.XmlDocCollector),
                                  None, None,
-                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,56--1,96),
+                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,56--2,96),
                                  { LeadingKeyword =
                                     StaticMember
-                                      (/root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,56--1,62),
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,63--1,69))
+                                      (/root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,56--2,62),
+                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,63--2,69))
                                    InlineKeyword = None
                                    WithKeyword = None
                                    EqualsRange = None }),
@@ -122,31 +122,31 @@ ImplFile
                                 IsFinal = false
                                 GetterOrSetterIsCompilerGenerated = false
                                 MemberKind = Member },
-                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,56--1,96),
+                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,56--2,96),
                               { GetSetKeywords = None }), Ident x,
-                           /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,36--1,100)),
-                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,36--1,37),
+                           /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,36--2,100)),
+                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,36--2,37),
                         Some
-                          /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,99--1,100),
-                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,36--1,100)),
+                          /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,99--2,100),
+                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,36--2,100)),
                      Var
                        (SynTypar (c, HeadType, false),
-                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,31--1,33)),
-                     /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,36--1,100)),
-                  /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,11--1,28),
+                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,31--2,33)),
+                     /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,36--2,100)),
+                  /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,11--2,28),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,0--1,3)
+                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,0--2,3)
                     InlineKeyword =
                      Some
-                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,4--1,10)
+                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,4--2,10)
                     EqualsRange =
                      Some
-                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,34--1,35) })],
-              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,0--1,100))],
+                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,34--2,35) })],
+              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,0--2,100))],
           PreXmlDocEmpty, [], None,
-          /root/NestedSynTypeOrInsideSynExprTraitCall.fs (1,0--1,100),
+          /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs
index f370fb4f8bc..a5106c09823 100644
--- a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs
+++ b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs
@@ -1,4 +1,5 @@
+
 type A =
     static type B =
                     class
-                    end
\ No newline at end of file
+                    end
diff --git a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
index 9893747cba6..b85cb7df87c 100644
--- a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
@@ -8,45 +8,45 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [A],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (1,5--1,6)),
+                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [NestedType
                         (SynTypeDefn
                            (SynComponentInfo
                               ([], None, [], [B],
-                               PreXmlDoc ((2,16), FSharp.Compiler.Xml.XmlDocCollector),
+                               PreXmlDoc ((3,16), FSharp.Compiler.Xml.XmlDocCollector),
                                false, None,
-                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,16--2,17)),
+                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,16--3,17)),
                             ObjectModel
                               (Class, [],
-                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,20--4,23)),
+                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (4,20--5,23)),
                             [], None,
-                            /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,16--4,23),
+                            /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,16--5,23),
                             { LeadingKeyword =
                                StaticType
-                                 (/root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,4--2,10),
-                                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,11--2,15))
+                                 (/root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,4--3,10),
+                                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,11--3,15))
                               EqualsRange =
                                Some
-                                 /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,18--2,19)
+                                 /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,18--3,19)
                               WithKeyword = None }), None,
-                         /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,4--4,23))],
-                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,4--4,23)),
+                         /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,4--6,0))],
+                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,4--6,0)),
                   [], None,
-                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (1,5--4,23),
+                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,5--6,0),
                   { LeadingKeyword =
                      Type
-                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (1,0--1,4)
+                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (1,7--1,8)
+                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (1,0--4,23))],
+              /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,0--6,0))],
           PreXmlDocEmpty, [], None,
-          /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (1,0--4,23),
+          /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi
index f370fb4f8bc..a5106c09823 100644
--- a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi
+++ b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi
@@ -1,4 +1,5 @@
+
 type A =
     static type B =
                     class
-                    end
\ No newline at end of file
+                    end
diff --git a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
index 114ba6fa2f3..25c2336908f 100644
--- a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
@@ -8,44 +8,44 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [A],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (1,5--1,6)),
+                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [NestedType
                         (SynTypeDefnSig
                            (SynComponentInfo
                               ([], None, [], [B],
-                               PreXmlDoc ((2,16), FSharp.Compiler.Xml.XmlDocCollector),
+                               PreXmlDoc ((3,16), FSharp.Compiler.Xml.XmlDocCollector),
                                false, None,
-                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,16--2,17)),
+                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,16--3,17)),
                             ObjectModel
                               (Class, [],
-                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,20--4,23)),
+                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (4,20--5,23)),
                             [],
-                            /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,16--4,23),
+                            /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,16--5,23),
                             { LeadingKeyword =
                                StaticType
-                                 (/root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,4--2,10),
-                                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,11--2,15))
+                                 (/root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,4--3,10),
+                                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,11--3,15))
                               EqualsRange =
                                Some
-                                 /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,18--2,19)
+                                 /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,18--3,19)
                               WithKeyword = None }),
-                         /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,4--4,23))],
-                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,4--4,23)),
+                         /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,4--6,0))],
+                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,4--6,0)),
                   [],
-                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (1,5--4,23),
+                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,5--6,0),
                   { LeadingKeyword =
                      Type
-                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (1,0--1,4)
+                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (1,7--1,8)
+                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,7--2,8)
                     WithKeyword = None })],
-              /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (1,0--4,23))],
+              /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,0--6,0))],
           PreXmlDocEmpty, [], None,
-          /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (1,0--4,23),
+          /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,0--6,0),
           { LeadingKeyword = None })], { ConditionalDirectives = []
                                          CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NewKeyword.fs b/tests/service/data/SyntaxTree/NewKeyword.fs
index 4134f032c1b..0a7cb11a87a 100644
--- a/tests/service/data/SyntaxTree/NewKeyword.fs
+++ b/tests/service/data/SyntaxTree/NewKeyword.fs
@@ -1,2 +1,3 @@
+
 type Y() =
-    new (message:string) = Y()
\ No newline at end of file
+    new (message:string) = Y()
diff --git a/tests/service/data/SyntaxTree/NewKeyword.fs.bsl b/tests/service/data/SyntaxTree/NewKeyword.fs.bsl
index 16b8ae55255..39683307a48 100644
--- a/tests/service/data/SyntaxTree/NewKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/NewKeyword.fs.bsl
@@ -7,19 +7,19 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Y],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/NewKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/NewKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
-                         SimplePats ([], /root/NewKeyword.fs (1,6--1,8)), None,
-                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/NewKeyword.fs (1,5--1,6), { AsKeyword = None });
+                         SimplePats ([], /root/NewKeyword.fs (2,6--2,8)), None,
+                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/NewKeyword.fs (2,5--2,6), { AsKeyword = None });
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = false
                                       IsDispatchSlot = false
@@ -38,35 +38,35 @@ ImplFile
                                     (Typed
                                        (Named
                                           (SynIdent (message, None), false, None,
-                                           /root/NewKeyword.fs (2,9--2,16)),
+                                           /root/NewKeyword.fs (3,9--3,16)),
                                         LongIdent
                                           (SynLongIdent ([string], [], [None])),
-                                        /root/NewKeyword.fs (2,9--2,23)),
-                                     /root/NewKeyword.fs (2,8--2,24))], None,
-                               /root/NewKeyword.fs (2,4--2,7)), None,
+                                        /root/NewKeyword.fs (3,9--3,23)),
+                                     /root/NewKeyword.fs (3,8--3,24))], None,
+                               /root/NewKeyword.fs (3,4--3,7)), None,
                             App
                               (Atomic, false, Ident Y,
-                               Const (Unit, /root/NewKeyword.fs (2,28--2,30)),
-                               /root/NewKeyword.fs (2,27--2,30)),
-                            /root/NewKeyword.fs (2,4--2,24), NoneAtInvisible,
+                               Const (Unit, /root/NewKeyword.fs (3,28--3,30)),
+                               /root/NewKeyword.fs (3,27--3,30)),
+                            /root/NewKeyword.fs (3,4--3,24), NoneAtInvisible,
                             { LeadingKeyword =
-                               New /root/NewKeyword.fs (2,4--2,7)
+                               New /root/NewKeyword.fs (3,4--3,7)
                               InlineKeyword = None
                               EqualsRange =
-                               Some /root/NewKeyword.fs (2,25--2,26) }),
-                         /root/NewKeyword.fs (2,4--2,30))],
-                     /root/NewKeyword.fs (2,4--2,30)), [],
+                               Some /root/NewKeyword.fs (3,25--3,26) }),
+                         /root/NewKeyword.fs (3,4--3,30))],
+                     /root/NewKeyword.fs (3,4--3,30)), [],
                   Some
                     (ImplicitCtor
                        (None, [],
-                        SimplePats ([], /root/NewKeyword.fs (1,6--1,8)), None,
-                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/NewKeyword.fs (1,5--1,6), { AsKeyword = None })),
-                  /root/NewKeyword.fs (1,5--2,30),
-                  { LeadingKeyword = Type /root/NewKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/NewKeyword.fs (1,9--1,10)
-                    WithKeyword = None })], /root/NewKeyword.fs (1,0--2,30))],
-          PreXmlDocEmpty, [], None, /root/NewKeyword.fs (1,0--2,30),
+                        SimplePats ([], /root/NewKeyword.fs (2,6--2,8)), None,
+                        PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/NewKeyword.fs (2,5--2,6), { AsKeyword = None })),
+                  /root/NewKeyword.fs (2,5--3,30),
+                  { LeadingKeyword = Type /root/NewKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/NewKeyword.fs (2,9--2,10)
+                    WithKeyword = None })], /root/NewKeyword.fs (2,0--3,30))],
+          PreXmlDocEmpty, [], None, /root/NewKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs b/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
index 640939533e7..99b5553f5e8 100644
--- a/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
+++ b/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
@@ -1,5 +1,6 @@
+
 try
     foo ()
 with exn ->
     // some comment
-    ()
\ No newline at end of file
+    ()
diff --git a/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
index 6a661034c54..bc2650c984f 100644
--- a/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
+++ b/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
@@ -12,41 +12,41 @@ ImplFile
                    (NonAtomic, false, Ident foo,
                     Const
                       (Unit,
-                       /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,8--2,10)),
-                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,4--2,10)),
+                       /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,8--3,10)),
+                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,4--3,10)),
                  [SynMatchClause
                     (Named
                        (SynIdent (exn, None), false, None,
-                        /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,5--3,8)),
+                        /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,5--4,8)),
                      None,
                      Const
                        (Unit,
-                        /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,4--5,6)),
-                     /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,5--5,6),
+                        /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (6,4--6,6)),
+                     /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,5--6,6),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,9--3,11)
+                          /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,9--4,11)
                        BarRange = None })],
-                 /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--5,6),
+                 /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--6,6),
                  Yes
-                   /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--1,3),
+                   /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--2,3),
                  Yes
-                   /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,0--3,4),
+                   /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,4),
                  { TryKeyword =
-                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--1,3)
+                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--2,3)
                    TryToWithRange =
-                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--3,4)
+                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--4,4)
                    WithKeyword =
-                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,0--3,4)
+                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,4)
                    WithToEndRange =
-                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,0--5,6) }),
-              /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--5,6))],
+                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--6,6) }),
+              /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--6,6))],
           PreXmlDocEmpty, [], None,
-          /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--5,6),
+          /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,4--4,19)] },
+            /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,4--5,19)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs b/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs
index 8b79151aec3..00613638d42 100644
--- a/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs
+++ b/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs
@@ -1,3 +1,4 @@
+
 type X() =
     let mutable allowInto = 0
-    member _.AllowIntoPattern with get() = allowInto and set v = allowInto <- v
\ No newline at end of file
+    member _.AllowIntoPattern with get() = allowInto and set v = allowInto <- v
diff --git a/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs.bsl b/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs.bsl
index 762960b7295..00a7f94e1a9 100644
--- a/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs.bsl
+++ b/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs.bsl
@@ -8,50 +8,50 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/ObjectModelWithTwoMembers.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/ObjectModelWithTwoMembers.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
-                           ([], /root/ObjectModelWithTwoMembers.fs (1,6--1,8)),
+                           ([], /root/ObjectModelWithTwoMembers.fs (2,6--2,8)),
                          None,
-                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/ObjectModelWithTwoMembers.fs (1,5--1,6),
+                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/ObjectModelWithTwoMembers.fs (2,5--2,6),
                          { AsKeyword = None });
                       LetBindings
                         ([SynBinding
                             (None, Normal, false, true, [],
-                             PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
                                 None),
                              Named
                                (SynIdent (allowInto, None), false, None,
-                                /root/ObjectModelWithTwoMembers.fs (2,16--2,25)),
+                                /root/ObjectModelWithTwoMembers.fs (3,16--3,25)),
                              None,
                              Const
                                (Int32 0,
-                                /root/ObjectModelWithTwoMembers.fs (2,28--2,29)),
-                             /root/ObjectModelWithTwoMembers.fs (2,16--2,25),
-                             Yes /root/ObjectModelWithTwoMembers.fs (2,4--2,29),
+                                /root/ObjectModelWithTwoMembers.fs (3,28--3,29)),
+                             /root/ObjectModelWithTwoMembers.fs (3,16--3,25),
+                             Yes /root/ObjectModelWithTwoMembers.fs (3,4--3,29),
                              { LeadingKeyword =
                                 Let
-                                  /root/ObjectModelWithTwoMembers.fs (2,4--2,7)
+                                  /root/ObjectModelWithTwoMembers.fs (3,4--3,7)
                                InlineKeyword = None
                                EqualsRange =
                                 Some
-                                  /root/ObjectModelWithTwoMembers.fs (2,26--2,27) })],
+                                  /root/ObjectModelWithTwoMembers.fs (3,26--3,27) })],
                          false, false,
-                         /root/ObjectModelWithTwoMembers.fs (2,4--2,29));
+                         /root/ObjectModelWithTwoMembers.fs (3,4--3,29));
                       GetSetMember
                         (Some
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -66,31 +66,31 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([_; AllowIntoPattern],
-                                     [/root/ObjectModelWithTwoMembers.fs (3,12--3,13)],
+                                     [/root/ObjectModelWithTwoMembers.fs (4,12--4,13)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/ObjectModelWithTwoMembers.fs (3,38--3,40)),
-                                        /root/ObjectModelWithTwoMembers.fs (3,38--3,40))],
+                                           /root/ObjectModelWithTwoMembers.fs (4,38--4,40)),
+                                        /root/ObjectModelWithTwoMembers.fs (4,38--4,40))],
                                   None,
-                                  /root/ObjectModelWithTwoMembers.fs (3,35--3,40)),
+                                  /root/ObjectModelWithTwoMembers.fs (4,35--4,40)),
                                None, Ident allowInto,
-                               /root/ObjectModelWithTwoMembers.fs (3,35--3,40),
+                               /root/ObjectModelWithTwoMembers.fs (4,35--4,40),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/ObjectModelWithTwoMembers.fs (3,4--3,10)
+                                    /root/ObjectModelWithTwoMembers.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/ObjectModelWithTwoMembers.fs (3,41--3,42) })),
+                                    /root/ObjectModelWithTwoMembers.fs (4,41--4,42) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -106,56 +106,56 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([_; AllowIntoPattern],
-                                     [/root/ObjectModelWithTwoMembers.fs (3,12--3,13)],
+                                     [/root/ObjectModelWithTwoMembers.fs (4,12--4,13)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Named
                                        (SynIdent (v, None), false, None,
-                                        /root/ObjectModelWithTwoMembers.fs (3,61--3,62))],
+                                        /root/ObjectModelWithTwoMembers.fs (4,61--4,62))],
                                   None,
-                                  /root/ObjectModelWithTwoMembers.fs (3,57--3,62)),
+                                  /root/ObjectModelWithTwoMembers.fs (4,57--4,62)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([allowInto], [], [None]),
                                   Ident v,
-                                  /root/ObjectModelWithTwoMembers.fs (3,65--3,79)),
-                               /root/ObjectModelWithTwoMembers.fs (3,57--3,62),
+                                  /root/ObjectModelWithTwoMembers.fs (4,65--4,79)),
+                               /root/ObjectModelWithTwoMembers.fs (4,57--4,62),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/ObjectModelWithTwoMembers.fs (3,4--3,10)
+                                    /root/ObjectModelWithTwoMembers.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/ObjectModelWithTwoMembers.fs (3,63--3,64) })),
-                         /root/ObjectModelWithTwoMembers.fs (3,4--3,79),
+                                    /root/ObjectModelWithTwoMembers.fs (4,63--4,64) })),
+                         /root/ObjectModelWithTwoMembers.fs (4,4--4,79),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/ObjectModelWithTwoMembers.fs (3,30--3,34)
+                            /root/ObjectModelWithTwoMembers.fs (4,30--4,34)
                            GetKeyword =
-                            Some /root/ObjectModelWithTwoMembers.fs (3,35--3,38)
+                            Some /root/ObjectModelWithTwoMembers.fs (4,35--4,38)
                            AndKeyword =
-                            Some /root/ObjectModelWithTwoMembers.fs (3,53--3,56)
+                            Some /root/ObjectModelWithTwoMembers.fs (4,53--4,56)
                            SetKeyword =
-                            Some /root/ObjectModelWithTwoMembers.fs (3,57--3,60) })],
-                     /root/ObjectModelWithTwoMembers.fs (2,4--3,79)), [],
+                            Some /root/ObjectModelWithTwoMembers.fs (4,57--4,60) })],
+                     /root/ObjectModelWithTwoMembers.fs (3,4--4,79)), [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
-                          ([], /root/ObjectModelWithTwoMembers.fs (1,6--1,8)),
+                          ([], /root/ObjectModelWithTwoMembers.fs (2,6--2,8)),
                         None,
-                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/ObjectModelWithTwoMembers.fs (1,5--1,6),
+                        PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/ObjectModelWithTwoMembers.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/ObjectModelWithTwoMembers.fs (1,5--3,79),
+                  /root/ObjectModelWithTwoMembers.fs (2,5--4,79),
                   { LeadingKeyword =
-                     Type /root/ObjectModelWithTwoMembers.fs (1,0--1,4)
+                     Type /root/ObjectModelWithTwoMembers.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/ObjectModelWithTwoMembers.fs (1,9--1,10)
+                     Some /root/ObjectModelWithTwoMembers.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/ObjectModelWithTwoMembers.fs (1,0--3,79))], PreXmlDocEmpty,
-          [], None, /root/ObjectModelWithTwoMembers.fs (1,0--3,79),
+              /root/ObjectModelWithTwoMembers.fs (2,0--4,79))], PreXmlDocEmpty,
+          [], None, /root/ObjectModelWithTwoMembers.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorAsFunction.fs b/tests/service/data/SyntaxTree/OperatorAsFunction.fs
index 3d80bba5cbc..31a52c7efbb 100644
--- a/tests/service/data/SyntaxTree/OperatorAsFunction.fs
+++ b/tests/service/data/SyntaxTree/OperatorAsFunction.fs
@@ -1 +1,2 @@
-(+) 3 4
\ No newline at end of file
+
+(+) 3 4
diff --git a/tests/service/data/SyntaxTree/OperatorAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorAsFunction.fs.bsl
index 4ef95d3ca3c..966818666af 100644
--- a/tests/service/data/SyntaxTree/OperatorAsFunction.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorAsFunction.fs.bsl
@@ -15,14 +15,14 @@ ImplFile
                          ([op_Addition], [],
                           [Some
                              (OriginalNotationWithParen
-                                (/root/OperatorAsFunction.fs (1,0--1,1), "+",
-                                 /root/OperatorAsFunction.fs (1,2--1,3)))]),
-                       None, /root/OperatorAsFunction.fs (1,0--1,3)),
-                    Const (Int32 3, /root/OperatorAsFunction.fs (1,4--1,5)),
-                    /root/OperatorAsFunction.fs (1,0--1,5)),
-                 Const (Int32 4, /root/OperatorAsFunction.fs (1,6--1,7)),
-                 /root/OperatorAsFunction.fs (1,0--1,7)),
-              /root/OperatorAsFunction.fs (1,0--1,7))], PreXmlDocEmpty, [], None,
-          /root/OperatorAsFunction.fs (1,0--1,7), { LeadingKeyword = None })],
+                                (/root/OperatorAsFunction.fs (2,0--2,1), "+",
+                                 /root/OperatorAsFunction.fs (2,2--2,3)))]),
+                       None, /root/OperatorAsFunction.fs (2,0--2,3)),
+                    Const (Int32 3, /root/OperatorAsFunction.fs (2,4--2,5)),
+                    /root/OperatorAsFunction.fs (2,0--2,5)),
+                 Const (Int32 4, /root/OperatorAsFunction.fs (2,6--2,7)),
+                 /root/OperatorAsFunction.fs (2,0--2,7)),
+              /root/OperatorAsFunction.fs (2,0--2,7))], PreXmlDocEmpty, [], None,
+          /root/OperatorAsFunction.fs (2,0--2,7), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs b/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs
index 9d6f38107b5..581b961dd82 100644
--- a/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs
+++ b/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs
@@ -1,2 +1,3 @@
+
 match x with
-| (head) :: (tail) -> ()
\ No newline at end of file
+| (head) :: (tail) -> ()
diff --git a/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs.bsl b/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs.bsl
index 13884d036e0..2ea6a141272 100644
--- a/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs.bsl
@@ -6,33 +6,33 @@ ImplFile
          ([OperatorInMatchPattern], false, AnonModule,
           [Expr
              (Match
-                (Yes /root/OperatorInMatchPattern.fs (1,0--1,12), Ident x,
+                (Yes /root/OperatorInMatchPattern.fs (2,0--2,12), Ident x,
                  [SynMatchClause
                     (ListCons
                        (Paren
                           (Named
                              (SynIdent (head, None), false, None,
-                              /root/OperatorInMatchPattern.fs (2,3--2,7)),
-                           /root/OperatorInMatchPattern.fs (2,2--2,8)),
+                              /root/OperatorInMatchPattern.fs (3,3--3,7)),
+                           /root/OperatorInMatchPattern.fs (3,2--3,8)),
                         Paren
                           (Named
                              (SynIdent (tail, None), false, None,
-                              /root/OperatorInMatchPattern.fs (2,13--2,17)),
-                           /root/OperatorInMatchPattern.fs (2,12--2,18)),
-                        /root/OperatorInMatchPattern.fs (2,2--2,18),
+                              /root/OperatorInMatchPattern.fs (3,13--3,17)),
+                           /root/OperatorInMatchPattern.fs (3,12--3,18)),
+                        /root/OperatorInMatchPattern.fs (3,2--3,18),
                         { ColonColonRange =
-                           /root/OperatorInMatchPattern.fs (2,9--2,11) }), None,
-                     Const (Unit, /root/OperatorInMatchPattern.fs (2,22--2,24)),
-                     /root/OperatorInMatchPattern.fs (2,2--2,24), Yes,
+                           /root/OperatorInMatchPattern.fs (3,9--3,11) }), None,
+                     Const (Unit, /root/OperatorInMatchPattern.fs (3,22--3,24)),
+                     /root/OperatorInMatchPattern.fs (3,2--3,24), Yes,
                      { ArrowRange =
-                        Some /root/OperatorInMatchPattern.fs (2,19--2,21)
+                        Some /root/OperatorInMatchPattern.fs (3,19--3,21)
                        BarRange =
-                        Some /root/OperatorInMatchPattern.fs (2,0--2,1) })],
-                 /root/OperatorInMatchPattern.fs (1,0--2,24),
-                 { MatchKeyword = /root/OperatorInMatchPattern.fs (1,0--1,5)
-                   WithKeyword = /root/OperatorInMatchPattern.fs (1,8--1,12) }),
-              /root/OperatorInMatchPattern.fs (1,0--2,24))], PreXmlDocEmpty, [],
-          None, /root/OperatorInMatchPattern.fs (1,0--2,24),
+                        Some /root/OperatorInMatchPattern.fs (3,0--3,1) })],
+                 /root/OperatorInMatchPattern.fs (2,0--3,24),
+                 { MatchKeyword = /root/OperatorInMatchPattern.fs (2,0--2,5)
+                   WithKeyword = /root/OperatorInMatchPattern.fs (2,8--2,12) }),
+              /root/OperatorInMatchPattern.fs (2,0--3,24))], PreXmlDocEmpty, [],
+          None, /root/OperatorInMatchPattern.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs b/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs
index 81c72307d5b..711cc45d298 100644
--- a/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs
+++ b/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs
@@ -1,2 +1,3 @@
+
 type X with
-    member _.(+) a b = a + b
\ No newline at end of file
+    member _.(+) a b = a + b
diff --git a/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs.bsl
index e9e405bef08..97536705a76 100644
--- a/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs.bsl
@@ -8,16 +8,16 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/OperatorInMemberDefinition.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/OperatorInMemberDefinition.fs (2,5--2,6)),
                   ObjectModel
                     (Augmentation
-                       /root/OperatorInMemberDefinition.fs (1,7--1,11), [],
-                     /root/OperatorInMemberDefinition.fs (1,5--2,28)),
+                       /root/OperatorInMemberDefinition.fs (2,7--2,11), [],
+                     /root/OperatorInMemberDefinition.fs (2,5--3,28)),
                   [Member
                      (SynBinding
                         (None, Normal, false, false, [],
-                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          SynValData
                            (Some { IsInstance = true
                                    IsDispatchSlot = false
@@ -33,23 +33,23 @@ ImplFile
                          LongIdent
                            (SynLongIdent
                               ([_; op_Addition],
-                               [/root/OperatorInMemberDefinition.fs (2,12--2,13)],
+                               [/root/OperatorInMemberDefinition.fs (3,12--3,13)],
                                [None;
                                 Some
                                   (OriginalNotationWithParen
-                                     (/root/OperatorInMemberDefinition.fs (2,13--2,14),
+                                     (/root/OperatorInMemberDefinition.fs (3,13--3,14),
                                       "+",
-                                      /root/OperatorInMemberDefinition.fs (2,15--2,16)))]),
+                                      /root/OperatorInMemberDefinition.fs (3,15--3,16)))]),
                             None, None,
                             Pats
                               [Named
                                  (SynIdent (a, None), false, None,
-                                  /root/OperatorInMemberDefinition.fs (2,17--2,18));
+                                  /root/OperatorInMemberDefinition.fs (3,17--3,18));
                                Named
                                  (SynIdent (b, None), false, None,
-                                  /root/OperatorInMemberDefinition.fs (2,19--2,20))],
+                                  /root/OperatorInMemberDefinition.fs (3,19--3,20))],
                             None,
-                            /root/OperatorInMemberDefinition.fs (2,11--2,20)),
+                            /root/OperatorInMemberDefinition.fs (3,11--3,20)),
                          None,
                          App
                            (NonAtomic, false,
@@ -60,28 +60,28 @@ ImplFile
                                   SynLongIdent
                                     ([op_Addition], [],
                                      [Some (OriginalNotation "+")]), None,
-                                  /root/OperatorInMemberDefinition.fs (2,25--2,26)),
+                                  /root/OperatorInMemberDefinition.fs (3,25--3,26)),
                                Ident a,
-                               /root/OperatorInMemberDefinition.fs (2,23--2,26)),
+                               /root/OperatorInMemberDefinition.fs (3,23--3,26)),
                             Ident b,
-                            /root/OperatorInMemberDefinition.fs (2,23--2,28)),
-                         /root/OperatorInMemberDefinition.fs (2,11--2,20),
+                            /root/OperatorInMemberDefinition.fs (3,23--3,28)),
+                         /root/OperatorInMemberDefinition.fs (3,11--3,20),
                          NoneAtInvisible,
                          { LeadingKeyword =
                             Member
-                              /root/OperatorInMemberDefinition.fs (2,4--2,10)
+                              /root/OperatorInMemberDefinition.fs (3,4--3,10)
                            InlineKeyword = None
                            EqualsRange =
                             Some
-                              /root/OperatorInMemberDefinition.fs (2,21--2,22) }),
-                      /root/OperatorInMemberDefinition.fs (2,4--2,28))], None,
-                  /root/OperatorInMemberDefinition.fs (1,5--2,28),
+                              /root/OperatorInMemberDefinition.fs (3,21--3,22) }),
+                      /root/OperatorInMemberDefinition.fs (3,4--3,28))], None,
+                  /root/OperatorInMemberDefinition.fs (2,5--3,28),
                   { LeadingKeyword =
-                     Type /root/OperatorInMemberDefinition.fs (1,0--1,4)
+                     Type /root/OperatorInMemberDefinition.fs (2,0--2,4)
                     EqualsRange = None
                     WithKeyword = None })],
-              /root/OperatorInMemberDefinition.fs (1,0--2,28))], PreXmlDocEmpty,
-          [], None, /root/OperatorInMemberDefinition.fs (1,0--2,28),
+              /root/OperatorInMemberDefinition.fs (2,0--3,28))], PreXmlDocEmpty,
+          [], None, /root/OperatorInMemberDefinition.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs b/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs
index 4ca72f39712..87ee8b80b40 100644
--- a/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs
+++ b/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs
@@ -1 +1,2 @@
-let (head::tail) =  [ 1;2;4]
\ No newline at end of file
+
+let (head::tail) =  [ 1;2;4]
diff --git a/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs.bsl b/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs.bsl
index 20dab8271cf..9afd9ee8c40 100644
--- a/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs.bsl
@@ -8,48 +8,48 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Paren
                     (ListCons
                        (Named
                           (SynIdent (head, None), false, None,
-                           /root/OperatorInSynPatLongIdent.fs (1,5--1,9)),
+                           /root/OperatorInSynPatLongIdent.fs (2,5--2,9)),
                         Named
                           (SynIdent (tail, None), false, None,
-                           /root/OperatorInSynPatLongIdent.fs (1,11--1,15)),
-                        /root/OperatorInSynPatLongIdent.fs (1,5--1,15),
+                           /root/OperatorInSynPatLongIdent.fs (2,11--2,15)),
+                        /root/OperatorInSynPatLongIdent.fs (2,5--2,15),
                         { ColonColonRange =
-                           /root/OperatorInSynPatLongIdent.fs (1,9--1,11) }),
-                     /root/OperatorInSynPatLongIdent.fs (1,4--1,16)), None,
+                           /root/OperatorInSynPatLongIdent.fs (2,9--2,11) }),
+                     /root/OperatorInSynPatLongIdent.fs (2,4--2,16)), None,
                   ArrayOrListComputed
                     (false,
                      Sequential
                        (SuppressNeither, true,
                         Const
                           (Int32 1,
-                           /root/OperatorInSynPatLongIdent.fs (1,22--1,23)),
+                           /root/OperatorInSynPatLongIdent.fs (2,22--2,23)),
                         Sequential
                           (SuppressNeither, true,
                            Const
                              (Int32 2,
-                              /root/OperatorInSynPatLongIdent.fs (1,24--1,25)),
+                              /root/OperatorInSynPatLongIdent.fs (2,24--2,25)),
                            Const
                              (Int32 4,
-                              /root/OperatorInSynPatLongIdent.fs (1,26--1,27)),
-                           /root/OperatorInSynPatLongIdent.fs (1,24--1,27)),
-                        /root/OperatorInSynPatLongIdent.fs (1,22--1,27)),
-                     /root/OperatorInSynPatLongIdent.fs (1,20--1,28)),
-                  /root/OperatorInSynPatLongIdent.fs (1,4--1,16),
-                  Yes /root/OperatorInSynPatLongIdent.fs (1,0--1,28),
+                              /root/OperatorInSynPatLongIdent.fs (2,26--2,27)),
+                           /root/OperatorInSynPatLongIdent.fs (2,24--2,27)),
+                        /root/OperatorInSynPatLongIdent.fs (2,22--2,27)),
+                     /root/OperatorInSynPatLongIdent.fs (2,20--2,28)),
+                  /root/OperatorInSynPatLongIdent.fs (2,4--2,16),
+                  Yes /root/OperatorInSynPatLongIdent.fs (2,0--2,28),
                   { LeadingKeyword =
-                     Let /root/OperatorInSynPatLongIdent.fs (1,0--1,3)
+                     Let /root/OperatorInSynPatLongIdent.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
-                     Some /root/OperatorInSynPatLongIdent.fs (1,17--1,18) })],
-              /root/OperatorInSynPatLongIdent.fs (1,0--1,28))], PreXmlDocEmpty,
-          [], None, /root/OperatorInSynPatLongIdent.fs (1,0--1,28),
+                     Some /root/OperatorInSynPatLongIdent.fs (2,17--2,18) })],
+              /root/OperatorInSynPatLongIdent.fs (2,0--2,28))], PreXmlDocEmpty,
+          [], None, /root/OperatorInSynPatLongIdent.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi b/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi
index 1953fc21a11..be63b6582cf 100644
--- a/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi
+++ b/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi
@@ -1,2 +1,3 @@
+
 module IntrinsicOperators
-val (&): e1: bool -> e2: bool -> bool
\ No newline at end of file
+val (&): e1: bool -> e2: bool -> bool
diff --git a/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi.bsl b/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi.bsl
index f6498034a37..ed2b0063b7d 100644
--- a/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi.bsl
@@ -11,40 +11,40 @@ SigFile
                    (op_Amp,
                     Some
                       (OriginalNotationWithParen
-                         (/root/OperatorNameInSynValSig.fsi (2,4--2,5), "&",
-                          /root/OperatorNameInSynValSig.fsi (2,6--2,7)))),
+                         (/root/OperatorNameInSynValSig.fsi (3,4--3,5), "&",
+                          /root/OperatorNameInSynValSig.fsi (3,6--3,7)))),
                  SynValTyparDecls (None, true),
                  Fun
                    (SignatureParameter
                       ([], false, Some e1,
                        LongIdent (SynLongIdent ([bool], [], [None])),
-                       /root/OperatorNameInSynValSig.fsi (2,9--2,17)),
+                       /root/OperatorNameInSynValSig.fsi (3,9--3,17)),
                     Fun
                       (SignatureParameter
                          ([], false, Some e2,
                           LongIdent (SynLongIdent ([bool], [], [None])),
-                          /root/OperatorNameInSynValSig.fsi (2,21--2,29)),
+                          /root/OperatorNameInSynValSig.fsi (3,21--3,29)),
                        LongIdent (SynLongIdent ([bool], [], [None])),
-                       /root/OperatorNameInSynValSig.fsi (2,21--2,37),
+                       /root/OperatorNameInSynValSig.fsi (3,21--3,37),
                        { ArrowRange =
-                          /root/OperatorNameInSynValSig.fsi (2,30--2,32) }),
-                    /root/OperatorNameInSynValSig.fsi (2,9--2,37),
+                          /root/OperatorNameInSynValSig.fsi (3,30--3,32) }),
+                    /root/OperatorNameInSynValSig.fsi (3,9--3,37),
                     { ArrowRange =
-                       /root/OperatorNameInSynValSig.fsi (2,18--2,20) }),
+                       /root/OperatorNameInSynValSig.fsi (3,18--3,20) }),
                  SynValInfo
                    ([[SynArgInfo ([], false, Some e1)];
                      [SynArgInfo ([], false, Some e2)]],
                     SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 None, /root/OperatorNameInSynValSig.fsi (2,0--2,37),
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None, /root/OperatorNameInSynValSig.fsi (3,0--3,37),
                  { LeadingKeyword =
-                    Val /root/OperatorNameInSynValSig.fsi (2,0--2,3)
+                    Val /root/OperatorNameInSynValSig.fsi (3,0--3,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/OperatorNameInSynValSig.fsi (2,0--2,37))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/OperatorNameInSynValSig.fsi (1,0--2,37),
-          { LeadingKeyword = Module /root/OperatorNameInSynValSig.fsi (1,0--1,6) })],
+              /root/OperatorNameInSynValSig.fsi (3,0--3,37))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/OperatorNameInSynValSig.fsi (2,0--3,37),
+          { LeadingKeyword = Module /root/OperatorNameInSynValSig.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi b/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi
index 93f93a27ade..e1ab714e844 100644
--- a/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi
+++ b/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi
@@ -1,3 +1,4 @@
+
 [<AutoOpen>]
     module Operators
     /// <summary>Overloaded unary negation.</summary>
@@ -8,4 +9,4 @@
     /// 
     /// <example-tbd></example-tbd>
     /// 
-    val inline (~-): n: ^T -> ^T when ^T: (static member ( ~- ): ^T -> ^T) and default ^T: int
\ No newline at end of file
+    val inline (~-): n: ^T -> ^T when ^T: (static member ( ~- ): ^T -> ^T) and default ^T: int
diff --git a/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi.bsl b/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi.bsl
index 0d6c956a9fc..98687f89e3a 100644
--- a/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi.bsl
+++ b/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi.bsl
@@ -11,9 +11,9 @@ SigFile
                    (op_UnaryNegation,
                     Some
                       (OriginalNotationWithParen
-                         (/root/OperatorNameInValConstraint.fsi (11,15--11,16),
+                         (/root/OperatorNameInValConstraint.fsi (12,15--12,16),
                           "~-",
-                          /root/OperatorNameInValConstraint.fsi (11,18--11,19)))),
+                          /root/OperatorNameInValConstraint.fsi (12,18--12,19)))),
                  SynValTyparDecls (None, true),
                  WithGlobalConstraints
                    (Fun
@@ -21,18 +21,18 @@ SigFile
                          ([], false, Some n,
                           Var
                             (SynTypar (T, HeadType, false),
-                             /root/OperatorNameInValConstraint.fsi (11,24--11,26)),
-                          /root/OperatorNameInValConstraint.fsi (11,21--11,26)),
+                             /root/OperatorNameInValConstraint.fsi (12,24--12,26)),
+                          /root/OperatorNameInValConstraint.fsi (12,21--12,26)),
                        Var
                          (SynTypar (T, HeadType, false),
-                          /root/OperatorNameInValConstraint.fsi (11,30--11,32)),
-                       /root/OperatorNameInValConstraint.fsi (11,21--11,32),
+                          /root/OperatorNameInValConstraint.fsi (12,30--12,32)),
+                       /root/OperatorNameInValConstraint.fsi (12,21--12,32),
                        { ArrowRange =
-                          /root/OperatorNameInValConstraint.fsi (11,27--11,29) }),
+                          /root/OperatorNameInValConstraint.fsi (12,27--12,29) }),
                     [WhereTyparSupportsMember
                        (Var
                           (SynTypar (T, HeadType, false),
-                           /root/OperatorNameInValConstraint.fsi (11,38--11,40)),
+                           /root/OperatorNameInValConstraint.fsi (12,38--12,40)),
                         Member
                           (SynValSig
                              ([],
@@ -40,30 +40,30 @@ SigFile
                                 (op_UnaryNegation,
                                  Some
                                    (OriginalNotationWithParen
-                                      (/root/OperatorNameInValConstraint.fsi (11,57--11,58),
+                                      (/root/OperatorNameInValConstraint.fsi (12,57--12,58),
                                        "~-",
-                                       /root/OperatorNameInValConstraint.fsi (11,62--11,63)))),
+                                       /root/OperatorNameInValConstraint.fsi (12,62--12,63)))),
                               SynValTyparDecls (None, true),
                               Fun
                                 (Var
                                    (SynTypar (T, HeadType, false),
-                                    /root/OperatorNameInValConstraint.fsi (11,65--11,67)),
+                                    /root/OperatorNameInValConstraint.fsi (12,65--12,67)),
                                  Var
                                    (SynTypar (T, HeadType, false),
-                                    /root/OperatorNameInValConstraint.fsi (11,71--11,73)),
-                                 /root/OperatorNameInValConstraint.fsi (11,65--11,73),
+                                    /root/OperatorNameInValConstraint.fsi (12,71--12,73)),
+                                 /root/OperatorNameInValConstraint.fsi (12,65--12,73),
                                  { ArrowRange =
-                                    /root/OperatorNameInValConstraint.fsi (11,68--11,70) }),
+                                    /root/OperatorNameInValConstraint.fsi (12,68--12,70) }),
                               SynValInfo
                                 ([[SynArgInfo ([], false, None)]],
                                  SynArgInfo ([], false, None)), false, false,
-                              PreXmlDoc ((11,43), FSharp.Compiler.Xml.XmlDocCollector),
+                              PreXmlDoc ((12,43), FSharp.Compiler.Xml.XmlDocCollector),
                               None, None,
-                              /root/OperatorNameInValConstraint.fsi (11,43--11,73),
+                              /root/OperatorNameInValConstraint.fsi (12,43--12,73),
                               { LeadingKeyword =
                                  StaticMember
-                                   (/root/OperatorNameInValConstraint.fsi (11,43--11,49),
-                                    /root/OperatorNameInValConstraint.fsi (11,50--11,56))
+                                   (/root/OperatorNameInValConstraint.fsi (12,43--12,49),
+                                    /root/OperatorNameInValConstraint.fsi (12,50--12,56))
                                 InlineKeyword = None
                                 WithKeyword = None
                                 EqualsRange = None }),
@@ -73,38 +73,38 @@ SigFile
                              IsFinal = false
                              GetterOrSetterIsCompilerGenerated = false
                              MemberKind = Member },
-                           /root/OperatorNameInValConstraint.fsi (11,43--11,73),
+                           /root/OperatorNameInValConstraint.fsi (12,43--12,73),
                            { GetSetKeywords = None }),
-                        /root/OperatorNameInValConstraint.fsi (11,38--11,74));
+                        /root/OperatorNameInValConstraint.fsi (12,38--12,74));
                      WhereTyparDefaultsToType
                        (SynTypar (T, HeadType, false),
                         LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/OperatorNameInValConstraint.fsi (11,79--11,94))],
-                    /root/OperatorNameInValConstraint.fsi (11,21--11,94)),
+                        /root/OperatorNameInValConstraint.fsi (12,79--12,94))],
+                    /root/OperatorNameInValConstraint.fsi (12,21--12,94)),
                  SynValInfo
                    ([[SynArgInfo ([], false, Some n)]],
                     SynArgInfo ([], false, None)), true, false,
-                 PreXmlDoc ((11,4), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 None, /root/OperatorNameInValConstraint.fsi (3,4--11,94),
+                 PreXmlDoc ((12,4), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None, /root/OperatorNameInValConstraint.fsi (4,4--12,94),
                  { LeadingKeyword =
-                    Val /root/OperatorNameInValConstraint.fsi (11,4--11,7)
+                    Val /root/OperatorNameInValConstraint.fsi (12,4--12,7)
                    InlineKeyword =
-                    Some /root/OperatorNameInValConstraint.fsi (11,8--11,14)
+                    Some /root/OperatorNameInValConstraint.fsi (12,8--12,14)
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/OperatorNameInValConstraint.fsi (3,4--11,94))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+              /root/OperatorNameInValConstraint.fsi (4,4--12,94))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
           [{ Attributes =
               [{ TypeName = SynLongIdent ([AutoOpen], [], [None])
                  ArgExpr =
                   Const
-                    (Unit, /root/OperatorNameInValConstraint.fsi (1,2--1,10))
+                    (Unit, /root/OperatorNameInValConstraint.fsi (2,2--2,10))
                  Target = None
                  AppliesToGetterAndSetter = false
-                 Range = /root/OperatorNameInValConstraint.fsi (1,2--1,10) }]
-             Range = /root/OperatorNameInValConstraint.fsi (1,0--1,12) }], None,
-          /root/OperatorNameInValConstraint.fsi (1,0--11,94),
+                 Range = /root/OperatorNameInValConstraint.fsi (2,2--2,10) }]
+             Range = /root/OperatorNameInValConstraint.fsi (2,0--2,12) }], None,
+          /root/OperatorNameInValConstraint.fsi (2,0--12,94),
           { LeadingKeyword =
-             Module /root/OperatorNameInValConstraint.fsi (2,4--2,10) })],
+             Module /root/OperatorNameInValConstraint.fsi (3,4--3,10) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OptionalExpression.fs b/tests/service/data/SyntaxTree/OptionalExpression.fs
index afdbba5bdc6..4a7e06e283a 100644
--- a/tests/service/data/SyntaxTree/OptionalExpression.fs
+++ b/tests/service/data/SyntaxTree/OptionalExpression.fs
@@ -1 +1,2 @@
-f(?x = 7)
\ No newline at end of file
+
+f(?x = 7)
diff --git a/tests/service/data/SyntaxTree/OptionalExpression.fs.bsl b/tests/service/data/SyntaxTree/OptionalExpression.fs.bsl
index 55b57e52d06..c5aa6352489 100644
--- a/tests/service/data/SyntaxTree/OptionalExpression.fs.bsl
+++ b/tests/service/data/SyntaxTree/OptionalExpression.fs.bsl
@@ -16,18 +16,18 @@ ImplFile
                             (false,
                              SynLongIdent
                                ([op_Equality], [], [Some (OriginalNotation "=")]),
-                             None, /root/OptionalExpression.fs (1,5--1,6)),
+                             None, /root/OptionalExpression.fs (2,5--2,6)),
                           LongIdent
                             (true, SynLongIdent ([x], [], [None]), None,
-                             /root/OptionalExpression.fs (1,3--1,4)),
-                          /root/OptionalExpression.fs (1,3--1,6)),
-                       Const (Int32 7, /root/OptionalExpression.fs (1,7--1,8)),
-                       /root/OptionalExpression.fs (1,3--1,8)),
-                    /root/OptionalExpression.fs (1,1--1,2),
-                    Some /root/OptionalExpression.fs (1,8--1,9),
-                    /root/OptionalExpression.fs (1,1--1,9)),
-                 /root/OptionalExpression.fs (1,0--1,9)),
-              /root/OptionalExpression.fs (1,0--1,9))], PreXmlDocEmpty, [], None,
-          /root/OptionalExpression.fs (1,0--1,9), { LeadingKeyword = None })],
+                             /root/OptionalExpression.fs (2,3--2,4)),
+                          /root/OptionalExpression.fs (2,3--2,6)),
+                       Const (Int32 7, /root/OptionalExpression.fs (2,7--2,8)),
+                       /root/OptionalExpression.fs (2,3--2,8)),
+                    /root/OptionalExpression.fs (2,1--2,2),
+                    Some /root/OptionalExpression.fs (2,8--2,9),
+                    /root/OptionalExpression.fs (2,1--2,9)),
+                 /root/OptionalExpression.fs (2,0--2,9)),
+              /root/OptionalExpression.fs (2,0--2,9))], PreXmlDocEmpty, [], None,
+          /root/OptionalExpression.fs (2,0--2,9), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OverrideKeyword.fs b/tests/service/data/SyntaxTree/OverrideKeyword.fs
index 87e15e92940..5d2013f36a6 100644
--- a/tests/service/data/SyntaxTree/OverrideKeyword.fs
+++ b/tests/service/data/SyntaxTree/OverrideKeyword.fs
@@ -1,2 +1,3 @@
+
 type D =
-    override E : string = ""
\ No newline at end of file
+    override E : string = ""
diff --git a/tests/service/data/SyntaxTree/OverrideKeyword.fs.bsl b/tests/service/data/SyntaxTree/OverrideKeyword.fs.bsl
index 83faaa0bc56..898576dc400 100644
--- a/tests/service/data/SyntaxTree/OverrideKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/OverrideKeyword.fs.bsl
@@ -8,14 +8,14 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [D],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/OverrideKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/OverrideKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -29,36 +29,36 @@ ImplFile
                             LongIdent
                               (SynLongIdent ([E], [], [None]), None, None,
                                Pats [], None,
-                               /root/OverrideKeyword.fs (2,13--2,14)),
+                               /root/OverrideKeyword.fs (3,13--3,14)),
                             Some
                               (SynBindingReturnInfo
                                  (LongIdent
                                     (SynLongIdent ([string], [], [None])),
-                                  /root/OverrideKeyword.fs (2,17--2,23), [],
+                                  /root/OverrideKeyword.fs (3,17--3,23), [],
                                   { ColonRange =
-                                     Some /root/OverrideKeyword.fs (2,15--2,16) })),
+                                     Some /root/OverrideKeyword.fs (3,15--3,16) })),
                             Typed
                               (Const
                                  (String
                                     ("", Regular,
-                                     /root/OverrideKeyword.fs (2,26--2,28)),
-                                  /root/OverrideKeyword.fs (2,26--2,28)),
+                                     /root/OverrideKeyword.fs (3,26--3,28)),
+                                  /root/OverrideKeyword.fs (3,26--3,28)),
                                LongIdent (SynLongIdent ([string], [], [None])),
-                               /root/OverrideKeyword.fs (2,26--2,28)),
-                            /root/OverrideKeyword.fs (2,13--2,14),
+                               /root/OverrideKeyword.fs (3,26--3,28)),
+                            /root/OverrideKeyword.fs (3,13--3,14),
                             NoneAtInvisible,
                             { LeadingKeyword =
-                               Override /root/OverrideKeyword.fs (2,4--2,12)
+                               Override /root/OverrideKeyword.fs (3,4--3,12)
                               InlineKeyword = None
                               EqualsRange =
-                               Some /root/OverrideKeyword.fs (2,24--2,25) }),
-                         /root/OverrideKeyword.fs (2,4--2,28))],
-                     /root/OverrideKeyword.fs (2,4--2,28)), [], None,
-                  /root/OverrideKeyword.fs (1,5--2,28),
-                  { LeadingKeyword = Type /root/OverrideKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/OverrideKeyword.fs (1,7--1,8)
-                    WithKeyword = None })], /root/OverrideKeyword.fs (1,0--2,28))],
-          PreXmlDocEmpty, [], None, /root/OverrideKeyword.fs (1,0--2,28),
+                               Some /root/OverrideKeyword.fs (3,24--3,25) }),
+                         /root/OverrideKeyword.fs (3,4--3,28))],
+                     /root/OverrideKeyword.fs (3,4--3,28)), [], None,
+                  /root/OverrideKeyword.fs (2,5--3,28),
+                  { LeadingKeyword = Type /root/OverrideKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/OverrideKeyword.fs (2,7--2,8)
+                    WithKeyword = None })], /root/OverrideKeyword.fs (2,0--3,28))],
+          PreXmlDocEmpty, [], None, /root/OverrideKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OverrideValKeyword.fs b/tests/service/data/SyntaxTree/OverrideValKeyword.fs
index 15887ca939b..3732a2566ec 100644
--- a/tests/service/data/SyntaxTree/OverrideValKeyword.fs
+++ b/tests/service/data/SyntaxTree/OverrideValKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    override val Y : int = 1
\ No newline at end of file
+    override val Y : int = 1
diff --git a/tests/service/data/SyntaxTree/OverrideValKeyword.fs.bsl b/tests/service/data/SyntaxTree/OverrideValKeyword.fs.bsl
index c7b385e06e3..cdbd91e2a6a 100644
--- a/tests/service/data/SyntaxTree/OverrideValKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/OverrideValKeyword.fs.bsl
@@ -8,8 +8,8 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/OverrideValKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/OverrideValKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AutoProperty
@@ -27,26 +27,26 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None,
                          Const
-                           (Int32 1, /root/OverrideValKeyword.fs (2,27--2,28)),
-                         /root/OverrideValKeyword.fs (2,4--2,28),
+                           (Int32 1, /root/OverrideValKeyword.fs (3,27--3,28)),
+                         /root/OverrideValKeyword.fs (3,4--3,28),
                          { LeadingKeyword =
                             OverrideVal
-                              (/root/OverrideValKeyword.fs (2,4--2,12),
-                               /root/OverrideValKeyword.fs (2,13--2,16))
+                              (/root/OverrideValKeyword.fs (3,4--3,12),
+                               /root/OverrideValKeyword.fs (3,13--3,16))
                            WithKeyword = None
                            EqualsRange =
-                            Some /root/OverrideValKeyword.fs (2,25--2,26)
+                            Some /root/OverrideValKeyword.fs (3,25--3,26)
                            GetSetKeywords = None })],
-                     /root/OverrideValKeyword.fs (2,4--2,28)), [], None,
-                  /root/OverrideValKeyword.fs (1,5--2,28),
-                  { LeadingKeyword = Type /root/OverrideValKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/OverrideValKeyword.fs (1,7--1,8)
+                     /root/OverrideValKeyword.fs (3,4--3,28)), [], None,
+                  /root/OverrideValKeyword.fs (2,5--3,28),
+                  { LeadingKeyword = Type /root/OverrideValKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/OverrideValKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/OverrideValKeyword.fs (1,0--2,28))], PreXmlDocEmpty, [],
-          None, /root/OverrideValKeyword.fs (1,0--2,28),
+              /root/OverrideValKeyword.fs (2,0--3,28))], PreXmlDocEmpty, [],
+          None, /root/OverrideValKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs b/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs
index 6d96fbb0b8e..f9259ecadbd 100644
--- a/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs
+++ b/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs
@@ -1,5 +1,6 @@
+
 match data with
 | OnePartData( // foo
     part1 = p1
   (* bar *) ) -> p1
-| _ -> failwith "todo"
\ No newline at end of file
+| _ -> failwith "todo"
diff --git a/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl b/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
index 25425a5a412..0d9a1882617 100644
--- a/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
+++ b/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
@@ -6,62 +6,62 @@ ImplFile
          ([ParenthesesOfSynArgPatsNamePatPairs], false, AnonModule,
           [Expr
              (Match
-                (Yes /root/ParenthesesOfSynArgPatsNamePatPairs.fs (1,0--1,15),
+                (Yes /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--2,15),
                  Ident data,
                  [SynMatchClause
                     (LongIdent
                        (SynLongIdent ([OnePartData], [], [None]), None, None,
                         NamePatPairs
                           ([(part1,
-                             /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,10--3,11),
+                             /root/ParenthesesOfSynArgPatsNamePatPairs.fs (4,10--4,11),
                              Named
                                (SynIdent (p1, None), false, None,
-                                /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,12--3,14)))],
-                           /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,4--4,13),
+                                /root/ParenthesesOfSynArgPatsNamePatPairs.fs (4,12--4,14)))],
+                           /root/ParenthesesOfSynArgPatsNamePatPairs.fs (4,4--5,13),
                            { ParenRange =
-                              /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,13--4,13) }),
+                              /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,13--5,13) }),
                         None,
-                        /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,2--4,13)),
+                        /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,2--5,13)),
                      None, Ident p1,
-                     /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,2--4,19),
+                     /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,2--5,19),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (4,14--4,16)
+                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,14--5,16)
                        BarRange =
                         Some
-                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--2,1) });
+                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,0--3,1) });
                   SynMatchClause
                     (Wild
-                       /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,2--5,3),
+                       /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,2--6,3),
                      None,
                      App
                        (NonAtomic, false, Ident failwith,
                         Const
                           (String
                              ("todo", Regular,
-                              /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,16--5,22)),
-                           /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,16--5,22)),
-                        /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,7--5,22)),
-                     /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,2--5,22),
+                              /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,16--6,22)),
+                           /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,16--6,22)),
+                        /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,7--6,22)),
+                     /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,2--6,22),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,4--5,6)
+                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,4--6,6)
                        BarRange =
                         Some
-                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,0--5,1) })],
-                 /root/ParenthesesOfSynArgPatsNamePatPairs.fs (1,0--5,22),
+                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,0--6,1) })],
+                 /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--6,22),
                  { MatchKeyword =
-                    /root/ParenthesesOfSynArgPatsNamePatPairs.fs (1,0--1,5)
+                    /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--2,5)
                    WithKeyword =
-                    /root/ParenthesesOfSynArgPatsNamePatPairs.fs (1,11--1,15) }),
-              /root/ParenthesesOfSynArgPatsNamePatPairs.fs (1,0--5,22))],
+                    /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,11--2,15) }),
+              /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--6,22))],
           PreXmlDocEmpty, [], None,
-          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (1,0--5,22),
+          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,15--2,21);
-          BlockComment /root/ParenthesesOfSynArgPatsNamePatPairs.fs (4,2--4,11)] },
+         [LineComment /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,15--3,21);
+          BlockComment /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,2--5,11)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs b/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs
index 60f6ff4e5cc..68f8d8d53ed 100644
--- a/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs
+++ b/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs
@@ -1 +1,2 @@
-(|Odd|_|) 4
\ No newline at end of file
+
+(|Odd|_|) 4
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs.bsl
index e8ddbecd5af..c49a6c3a251 100644
--- a/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs.bsl
+++ b/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs.bsl
@@ -13,16 +13,16 @@ ImplFile
                       ([|Odd|_|], [],
                        [Some
                           (HasParenthesis
-                             (/root/PartialActivePatternAsFunction.fs (1,0--1,1),
-                              /root/PartialActivePatternAsFunction.fs (1,8--1,9)))]),
-                    None, /root/PartialActivePatternAsFunction.fs (1,0--1,9)),
+                             (/root/PartialActivePatternAsFunction.fs (2,0--2,1),
+                              /root/PartialActivePatternAsFunction.fs (2,8--2,9)))]),
+                    None, /root/PartialActivePatternAsFunction.fs (2,0--2,9)),
                  Const
                    (Int32 4,
-                    /root/PartialActivePatternAsFunction.fs (1,10--1,11)),
-                 /root/PartialActivePatternAsFunction.fs (1,0--1,11)),
-              /root/PartialActivePatternAsFunction.fs (1,0--1,11))],
+                    /root/PartialActivePatternAsFunction.fs (2,10--2,11)),
+                 /root/PartialActivePatternAsFunction.fs (2,0--2,11)),
+              /root/PartialActivePatternAsFunction.fs (2,0--2,11))],
           PreXmlDocEmpty, [], None,
-          /root/PartialActivePatternAsFunction.fs (1,0--1,11),
+          /root/PartialActivePatternAsFunction.fs (2,0--2,11),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs b/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs
index 782591fc09c..59fb5e06343 100644
--- a/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs
+++ b/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs
@@ -1 +1,2 @@
-let (|Int32Const|_|) (a: SynConst) = match a with SynConst.Int32 _ -> Some a | _ -> None
\ No newline at end of file
+
+let (|Int32Const|_|) (a: SynConst) = match a with SynConst.Int32 _ -> Some a | _ -> None
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs.bsl
index de7257b75e1..6f7a8fe7c8b 100644
--- a/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -19,70 +19,70 @@ ImplFile
                        ([|Int32Const|_|], [],
                         [Some
                            (HasParenthesis
-                              (/root/PartialActivePatternDefinition.fs (1,4--1,5),
-                               /root/PartialActivePatternDefinition.fs (1,19--1,20)))]),
+                              (/root/PartialActivePatternDefinition.fs (2,4--2,5),
+                               /root/PartialActivePatternDefinition.fs (2,19--2,20)))]),
                      None, None,
                      Pats
                        [Paren
                           (Typed
                              (Named
                                 (SynIdent (a, None), false, None,
-                                 /root/PartialActivePatternDefinition.fs (1,22--1,23)),
+                                 /root/PartialActivePatternDefinition.fs (2,22--2,23)),
                               LongIdent (SynLongIdent ([SynConst], [], [None])),
-                              /root/PartialActivePatternDefinition.fs (1,22--1,33)),
-                           /root/PartialActivePatternDefinition.fs (1,21--1,34))],
-                     None, /root/PartialActivePatternDefinition.fs (1,4--1,34)),
+                              /root/PartialActivePatternDefinition.fs (2,22--2,33)),
+                           /root/PartialActivePatternDefinition.fs (2,21--2,34))],
+                     None, /root/PartialActivePatternDefinition.fs (2,4--2,34)),
                   None,
                   Match
-                    (Yes /root/PartialActivePatternDefinition.fs (1,37--1,49),
+                    (Yes /root/PartialActivePatternDefinition.fs (2,37--2,49),
                      Ident a,
                      [SynMatchClause
                         (LongIdent
                            (SynLongIdent
                               ([SynConst; Int32],
-                               [/root/PartialActivePatternDefinition.fs (1,58--1,59)],
+                               [/root/PartialActivePatternDefinition.fs (2,58--2,59)],
                                [None; None]), None, None,
                             Pats
                               [Wild
-                                 /root/PartialActivePatternDefinition.fs (1,65--1,66)],
+                                 /root/PartialActivePatternDefinition.fs (2,65--2,66)],
                             None,
-                            /root/PartialActivePatternDefinition.fs (1,50--1,66)),
+                            /root/PartialActivePatternDefinition.fs (2,50--2,66)),
                          None,
                          App
                            (NonAtomic, false, Ident Some, Ident a,
-                            /root/PartialActivePatternDefinition.fs (1,70--1,76)),
-                         /root/PartialActivePatternDefinition.fs (1,50--1,76),
+                            /root/PartialActivePatternDefinition.fs (2,70--2,76)),
+                         /root/PartialActivePatternDefinition.fs (2,50--2,76),
                          Yes,
                          { ArrowRange =
                             Some
-                              /root/PartialActivePatternDefinition.fs (1,67--1,69)
+                              /root/PartialActivePatternDefinition.fs (2,67--2,69)
                            BarRange = None });
                       SynMatchClause
                         (Wild
-                           /root/PartialActivePatternDefinition.fs (1,79--1,80),
+                           /root/PartialActivePatternDefinition.fs (2,79--2,80),
                          None, Ident None,
-                         /root/PartialActivePatternDefinition.fs (1,79--1,88),
+                         /root/PartialActivePatternDefinition.fs (2,79--2,88),
                          Yes,
                          { ArrowRange =
                             Some
-                              /root/PartialActivePatternDefinition.fs (1,81--1,83)
+                              /root/PartialActivePatternDefinition.fs (2,81--2,83)
                            BarRange =
                             Some
-                              /root/PartialActivePatternDefinition.fs (1,77--1,78) })],
-                     /root/PartialActivePatternDefinition.fs (1,37--1,88),
+                              /root/PartialActivePatternDefinition.fs (2,77--2,78) })],
+                     /root/PartialActivePatternDefinition.fs (2,37--2,88),
                      { MatchKeyword =
-                        /root/PartialActivePatternDefinition.fs (1,37--1,42)
+                        /root/PartialActivePatternDefinition.fs (2,37--2,42)
                        WithKeyword =
-                        /root/PartialActivePatternDefinition.fs (1,45--1,49) }),
-                  /root/PartialActivePatternDefinition.fs (1,4--1,34), NoneAtLet,
+                        /root/PartialActivePatternDefinition.fs (2,45--2,49) }),
+                  /root/PartialActivePatternDefinition.fs (2,4--2,34), NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/PartialActivePatternDefinition.fs (1,0--1,3)
+                     Let /root/PartialActivePatternDefinition.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
-                     Some /root/PartialActivePatternDefinition.fs (1,35--1,36) })],
-              /root/PartialActivePatternDefinition.fs (1,0--1,88))],
+                     Some /root/PartialActivePatternDefinition.fs (2,35--2,36) })],
+              /root/PartialActivePatternDefinition.fs (2,0--2,88))],
           PreXmlDocEmpty, [], None,
-          /root/PartialActivePatternDefinition.fs (1,0--1,88),
+          /root/PartialActivePatternDefinition.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs b/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs
index 0ad0f1677ec..f72bb351789 100644
--- a/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs
+++ b/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs
@@ -1 +1,2 @@
-let (|Boolean|_|) = Boolean.parse
\ No newline at end of file
+
+let (|Boolean|_|) = Boolean.parse
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs.bsl b/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs.bsl
index 4b10e5c2360..9c593706b4e 100644
--- a/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs.bsl
+++ b/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs.bsl
@@ -9,7 +9,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
@@ -17,31 +17,31 @@ ImplFile
                        (|Boolean|_|,
                         Some
                           (HasParenthesis
-                             (/root/PartialActivePatternDefinitionWithoutParameters.fs (1,4--1,5),
-                              /root/PartialActivePatternDefinitionWithoutParameters.fs (1,16--1,17)))),
+                             (/root/PartialActivePatternDefinitionWithoutParameters.fs (2,4--2,5),
+                              /root/PartialActivePatternDefinitionWithoutParameters.fs (2,16--2,17)))),
                      false, None,
-                     /root/PartialActivePatternDefinitionWithoutParameters.fs (1,5--1,16)),
+                     /root/PartialActivePatternDefinitionWithoutParameters.fs (2,5--2,16)),
                   None,
                   LongIdent
                     (false,
                      SynLongIdent
                        ([Boolean; parse],
-                        [/root/PartialActivePatternDefinitionWithoutParameters.fs (1,27--1,28)],
+                        [/root/PartialActivePatternDefinitionWithoutParameters.fs (2,27--2,28)],
                         [None; None]), None,
-                     /root/PartialActivePatternDefinitionWithoutParameters.fs (1,20--1,33)),
-                  /root/PartialActivePatternDefinitionWithoutParameters.fs (1,4--1,17),
+                     /root/PartialActivePatternDefinitionWithoutParameters.fs (2,20--2,33)),
+                  /root/PartialActivePatternDefinitionWithoutParameters.fs (2,4--2,17),
                   Yes
-                    /root/PartialActivePatternDefinitionWithoutParameters.fs (1,0--1,33),
+                    /root/PartialActivePatternDefinitionWithoutParameters.fs (2,0--2,33),
                   { LeadingKeyword =
                      Let
-                       /root/PartialActivePatternDefinitionWithoutParameters.fs (1,0--1,3)
+                       /root/PartialActivePatternDefinitionWithoutParameters.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/PartialActivePatternDefinitionWithoutParameters.fs (1,18--1,19) })],
-              /root/PartialActivePatternDefinitionWithoutParameters.fs (1,0--1,33))],
+                       /root/PartialActivePatternDefinitionWithoutParameters.fs (2,18--2,19) })],
+              /root/PartialActivePatternDefinitionWithoutParameters.fs (2,0--2,33))],
           PreXmlDocEmpty, [], None,
-          /root/PartialActivePatternDefinitionWithoutParameters.fs (1,0--1,33),
+          /root/PartialActivePatternDefinitionWithoutParameters.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrefixOperation.fs b/tests/service/data/SyntaxTree/PrefixOperation.fs
index 4005c82dd55..00ed29e8ce0 100644
--- a/tests/service/data/SyntaxTree/PrefixOperation.fs
+++ b/tests/service/data/SyntaxTree/PrefixOperation.fs
@@ -1 +1,2 @@
-+ -86
\ No newline at end of file
+
++ -86
diff --git a/tests/service/data/SyntaxTree/PrefixOperation.fs.bsl b/tests/service/data/SyntaxTree/PrefixOperation.fs.bsl
index e1f7ae93b4d..e84dcf46fad 100644
--- a/tests/service/data/SyntaxTree/PrefixOperation.fs.bsl
+++ b/tests/service/data/SyntaxTree/PrefixOperation.fs.bsl
@@ -11,10 +11,10 @@ ImplFile
                    (false,
                     SynLongIdent
                       ([op_UnaryPlus], [], [Some (OriginalNotation "+")]), None,
-                    /root/PrefixOperation.fs (1,0--1,1)),
-                 Const (Int32 -86, /root/PrefixOperation.fs (1,2--1,5)),
-                 /root/PrefixOperation.fs (1,0--1,5)),
-              /root/PrefixOperation.fs (1,0--1,5))], PreXmlDocEmpty, [], None,
-          /root/PrefixOperation.fs (1,0--1,5), { LeadingKeyword = None })],
+                    /root/PrefixOperation.fs (2,0--2,1)),
+                 Const (Int32 -86, /root/PrefixOperation.fs (2,2--2,5)),
+                 /root/PrefixOperation.fs (2,0--2,5)),
+              /root/PrefixOperation.fs (2,0--2,5))], PreXmlDocEmpty, [], None,
+          /root/PrefixOperation.fs (2,0--2,5), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs b/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs
index 42255ea1d43..500dae1fb46 100644
--- a/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs
+++ b/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs
@@ -1 +1,2 @@
-%%arg
\ No newline at end of file
+
+%%arg
diff --git a/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs.bsl b/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs.bsl
index fadf60849ae..034e2224953 100644
--- a/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs.bsl
+++ b/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs.bsl
@@ -11,11 +11,11 @@ ImplFile
                    (false,
                     SynLongIdent
                       ([op_SpliceUntyped], [], [Some (OriginalNotation "%%")]),
-                    None, /root/PrefixOperationWithTwoCharacters.fs (1,0--1,2)),
-                 Ident arg, /root/PrefixOperationWithTwoCharacters.fs (1,0--1,5)),
-              /root/PrefixOperationWithTwoCharacters.fs (1,0--1,5))],
+                    None, /root/PrefixOperationWithTwoCharacters.fs (2,0--2,2)),
+                 Ident arg, /root/PrefixOperationWithTwoCharacters.fs (2,0--2,5)),
+              /root/PrefixOperationWithTwoCharacters.fs (2,0--2,5))],
           PreXmlDocEmpty, [], None,
-          /root/PrefixOperationWithTwoCharacters.fs (1,0--1,5),
+          /root/PrefixOperationWithTwoCharacters.fs (2,0--2,5),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs b/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs
index b18d97c9855..c75ca1e9d35 100644
--- a/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs
+++ b/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs
@@ -1,3 +1,4 @@
+
 type Currency =
     // Temporary fix until a new Thoth.Json.Net package is released
     // See https://github.com/MangelMaxime/Thoth/pull/70
@@ -5,4 +6,4 @@ type Currency =
 #if !FABLE_COMPILER
     private
 #endif
-    | Code of string
\ No newline at end of file
+    | Code of string
diff --git a/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs.bsl b/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs.bsl
index 21ce3499a43..a05c920e240 100644
--- a/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs.bsl
@@ -8,12 +8,12 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Currency],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/PrivateKeywordHasRange.fs (1,5--1,13)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/PrivateKeywordHasRange.fs (2,5--2,13)),
                   Simple
                     (Union
                        (Some
-                          (Private /root/PrivateKeywordHasRange.fs (6,4--6,11)),
+                          (Private /root/PrivateKeywordHasRange.fs (7,4--7,11)),
                         [SynUnionCase
                            ([], SynIdent (Code, None),
                             Fields
@@ -21,30 +21,30 @@ ImplFile
                                  ([], false, None,
                                   LongIdent
                                     (SynLongIdent ([string], [], [None])), false,
-                                  PreXmlDoc ((8,14), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((9,14), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/PrivateKeywordHasRange.fs (8,14--8,20),
+                                  /root/PrivateKeywordHasRange.fs (9,14--9,20),
                                   { LeadingKeyword = None })],
-                            PreXmlDoc ((8,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            None, /root/PrivateKeywordHasRange.fs (8,6--8,20),
+                            PreXmlDoc ((9,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, /root/PrivateKeywordHasRange.fs (9,6--9,20),
                             { BarRange =
-                               Some /root/PrivateKeywordHasRange.fs (8,4--8,5) })],
-                        /root/PrivateKeywordHasRange.fs (6,4--8,20)),
-                     /root/PrivateKeywordHasRange.fs (6,4--8,20)), [], None,
-                  /root/PrivateKeywordHasRange.fs (1,5--8,20),
+                               Some /root/PrivateKeywordHasRange.fs (9,4--9,5) })],
+                        /root/PrivateKeywordHasRange.fs (7,4--9,20)),
+                     /root/PrivateKeywordHasRange.fs (7,4--9,20)), [], None,
+                  /root/PrivateKeywordHasRange.fs (2,5--9,20),
                   { LeadingKeyword =
-                     Type /root/PrivateKeywordHasRange.fs (1,0--1,4)
+                     Type /root/PrivateKeywordHasRange.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/PrivateKeywordHasRange.fs (1,14--1,15)
+                     Some /root/PrivateKeywordHasRange.fs (2,14--2,15)
                     WithKeyword = None })],
-              /root/PrivateKeywordHasRange.fs (1,0--8,20))], PreXmlDocEmpty, [],
-          None, /root/PrivateKeywordHasRange.fs (1,0--8,20),
+              /root/PrivateKeywordHasRange.fs (2,0--9,20))], PreXmlDocEmpty, [],
+          None, /root/PrivateKeywordHasRange.fs (2,0--10,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives =
          [If
             (Not (Ident "FABLE_COMPILER"),
-             /root/PrivateKeywordHasRange.fs (5,0--5,19));
-          EndIf /root/PrivateKeywordHasRange.fs (7,0--7,6)]
+             /root/PrivateKeywordHasRange.fs (6,0--6,19));
+          EndIf /root/PrivateKeywordHasRange.fs (8,0--8,6)]
         CodeComments =
-         [LineComment /root/PrivateKeywordHasRange.fs (2,4--2,67);
-          LineComment /root/PrivateKeywordHasRange.fs (3,4--3,56)] }, set []))
\ No newline at end of file
+         [LineComment /root/PrivateKeywordHasRange.fs (3,4--3,67);
+          LineComment /root/PrivateKeywordHasRange.fs (4,4--4,56)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs b/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs
index 6070ad71ee2..d858d59f0f1 100644
--- a/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs
+++ b/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs
@@ -1 +1,2 @@
-let PowByte (x:byte) n = Checked.( * ) x
\ No newline at end of file
+
+let PowByte (x:byte) n = Checked.( * ) x
diff --git a/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs.bsl b/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs.bsl
index 65c9a9a6013..332aec0dd0a 100644
--- a/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs.bsl
+++ b/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -22,14 +22,14 @@ ImplFile
                           (Typed
                              (Named
                                 (SynIdent (x, None), false, None,
-                                 /root/QualifiedOperatorExpression.fs (1,13--1,14)),
+                                 /root/QualifiedOperatorExpression.fs (2,13--2,14)),
                               LongIdent (SynLongIdent ([byte], [], [None])),
-                              /root/QualifiedOperatorExpression.fs (1,13--1,19)),
-                           /root/QualifiedOperatorExpression.fs (1,12--1,20));
+                              /root/QualifiedOperatorExpression.fs (2,13--2,19)),
+                           /root/QualifiedOperatorExpression.fs (2,12--2,20));
                         Named
                           (SynIdent (n, None), false, None,
-                           /root/QualifiedOperatorExpression.fs (1,21--1,22))],
-                     None, /root/QualifiedOperatorExpression.fs (1,4--1,22)),
+                           /root/QualifiedOperatorExpression.fs (2,21--2,22))],
+                     None, /root/QualifiedOperatorExpression.fs (2,4--2,22)),
                   None,
                   App
                     (NonAtomic, false,
@@ -37,23 +37,23 @@ ImplFile
                        (false,
                         SynLongIdent
                           ([Checked; op_Multiply],
-                           [/root/QualifiedOperatorExpression.fs (1,32--1,33)],
+                           [/root/QualifiedOperatorExpression.fs (2,32--2,33)],
                            [None;
                             Some
                               (OriginalNotationWithParen
-                                 (/root/QualifiedOperatorExpression.fs (1,33--1,34),
+                                 (/root/QualifiedOperatorExpression.fs (2,33--2,34),
                                   "*",
-                                  /root/QualifiedOperatorExpression.fs (1,37--1,38)))]),
-                        None, /root/QualifiedOperatorExpression.fs (1,25--1,38)),
-                     Ident x, /root/QualifiedOperatorExpression.fs (1,25--1,40)),
-                  /root/QualifiedOperatorExpression.fs (1,4--1,22), NoneAtLet,
+                                  /root/QualifiedOperatorExpression.fs (2,37--2,38)))]),
+                        None, /root/QualifiedOperatorExpression.fs (2,25--2,38)),
+                     Ident x, /root/QualifiedOperatorExpression.fs (2,25--2,40)),
+                  /root/QualifiedOperatorExpression.fs (2,4--2,22), NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/QualifiedOperatorExpression.fs (1,0--1,3)
+                     Let /root/QualifiedOperatorExpression.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
-                     Some /root/QualifiedOperatorExpression.fs (1,23--1,24) })],
-              /root/QualifiedOperatorExpression.fs (1,0--1,40))], PreXmlDocEmpty,
-          [], None, /root/QualifiedOperatorExpression.fs (1,0--1,40),
+                     Some /root/QualifiedOperatorExpression.fs (2,23--2,24) })],
+              /root/QualifiedOperatorExpression.fs (2,0--2,40))], PreXmlDocEmpty,
+          [], None, /root/QualifiedOperatorExpression.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi b/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi
index 830b8557180..c37ba4033a1 100644
--- a/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi
+++ b/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi
@@ -1,3 +1,4 @@
+
 namespace Foobar
 
-type Bar = | Bar of string * int
\ No newline at end of file
+type Bar = | Bar of string * int
diff --git a/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl b/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
index 951f594cfcd..bcd11114de2 100644
--- a/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
@@ -9,9 +9,9 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Bar],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,5--3,8)),
+                     /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,5--4,8)),
                   Simple
                     (Union
                        (None,
@@ -22,40 +22,40 @@ SigFile
                                  ([], false, None,
                                   LongIdent
                                     (SynLongIdent ([string], [], [None])), false,
-                                  PreXmlDoc ((3,20), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((4,20), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,20--3,26),
+                                  /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,20--4,26),
                                   { LeadingKeyword = None });
                                SynField
                                  ([], false, None,
                                   LongIdent (SynLongIdent ([int], [], [None])),
                                   false,
-                                  PreXmlDoc ((3,29), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((4,29), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,29--3,32),
+                                  /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,29--4,32),
                                   { LeadingKeyword = None })],
-                            PreXmlDoc ((3,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((4,11), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,13--3,32),
+                            /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,13--4,32),
                             { BarRange =
                                Some
-                                 /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,11--3,12) })],
-                        /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,11--3,32)),
-                     /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,11--3,32)),
+                                 /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,11--4,12) })],
+                        /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,11--4,32)),
+                     /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,11--4,32)),
                   [],
-                  /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,5--3,32),
+                  /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,5--4,32),
                   { LeadingKeyword =
                      Type
-                       /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,0--3,4)
+                       /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,9--3,10)
+                       /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,9--4,10)
                     WithKeyword = None })],
-              /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (3,0--3,32))],
+              /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,0--4,32))],
           PreXmlDocEmpty, [], None,
-          /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (1,0--3,32),
+          /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (2,0--4,32),
           { LeadingKeyword =
              Namespace
-               /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (1,0--1,9) })],
+               /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs
index cd26824b5d9..e9febd493cd 100644
--- a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs
+++ b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs
@@ -1,2 +1,3 @@
+
 match foo with
-| Bar bar -> ()
\ No newline at end of file
+| Bar bar -> ()
diff --git a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs.bsl
index 4fb1d3e2233..8be43807c56 100644
--- a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs.bsl
@@ -6,7 +6,7 @@ ImplFile
          ([RangeOfArrowInSynMatchClause], false, AnonModule,
           [Expr
              (Match
-                (Yes /root/RangeOfArrowInSynMatchClause.fs (1,0--1,14),
+                (Yes /root/RangeOfArrowInSynMatchClause.fs (2,0--2,14),
                  Ident foo,
                  [SynMatchClause
                     (LongIdent
@@ -14,24 +14,24 @@ ImplFile
                         Pats
                           [Named
                              (SynIdent (bar, None), false, None,
-                              /root/RangeOfArrowInSynMatchClause.fs (2,6--2,9))],
-                        None, /root/RangeOfArrowInSynMatchClause.fs (2,2--2,9)),
+                              /root/RangeOfArrowInSynMatchClause.fs (3,6--3,9))],
+                        None, /root/RangeOfArrowInSynMatchClause.fs (3,2--3,9)),
                      None,
                      Const
-                       (Unit, /root/RangeOfArrowInSynMatchClause.fs (2,13--2,15)),
-                     /root/RangeOfArrowInSynMatchClause.fs (2,2--2,15), Yes,
+                       (Unit, /root/RangeOfArrowInSynMatchClause.fs (3,13--3,15)),
+                     /root/RangeOfArrowInSynMatchClause.fs (3,2--3,15), Yes,
                      { ArrowRange =
-                        Some /root/RangeOfArrowInSynMatchClause.fs (2,10--2,12)
+                        Some /root/RangeOfArrowInSynMatchClause.fs (3,10--3,12)
                        BarRange =
-                        Some /root/RangeOfArrowInSynMatchClause.fs (2,0--2,1) })],
-                 /root/RangeOfArrowInSynMatchClause.fs (1,0--2,15),
+                        Some /root/RangeOfArrowInSynMatchClause.fs (3,0--3,1) })],
+                 /root/RangeOfArrowInSynMatchClause.fs (2,0--3,15),
                  { MatchKeyword =
-                    /root/RangeOfArrowInSynMatchClause.fs (1,0--1,5)
+                    /root/RangeOfArrowInSynMatchClause.fs (2,0--2,5)
                    WithKeyword =
-                    /root/RangeOfArrowInSynMatchClause.fs (1,10--1,14) }),
-              /root/RangeOfArrowInSynMatchClause.fs (1,0--2,15))],
+                    /root/RangeOfArrowInSynMatchClause.fs (2,10--2,14) }),
+              /root/RangeOfArrowInSynMatchClause.fs (2,0--3,15))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfArrowInSynMatchClause.fs (1,0--2,15),
+          /root/RangeOfArrowInSynMatchClause.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs
index cf99189fafb..85ef7900a4b 100644
--- a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs
+++ b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs
@@ -1,2 +1,3 @@
+
 match foo with
-| Bar bar when (someCheck bar) -> ()
\ No newline at end of file
+| Bar bar when (someCheck bar) -> ()
diff --git a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
index 89bcb7548d5..5956f8ce2cf 100644
--- a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
@@ -7,7 +7,7 @@ ImplFile
           [Expr
              (Match
                 (Yes
-                   /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (1,0--1,14),
+                   /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--2,14),
                  Ident foo,
                  [SynMatchClause
                     (LongIdent
@@ -15,37 +15,37 @@ ImplFile
                         Pats
                           [Named
                              (SynIdent (bar, None), false, None,
-                              /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,6--2,9))],
+                              /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,6--3,9))],
                         None,
-                        /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,2--2,9)),
+                        /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,2--3,9)),
                      Some
                        (Paren
                           (App
                              (NonAtomic, false, Ident someCheck, Ident bar,
-                              /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,16--2,29)),
-                           /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,15--2,16),
+                              /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,16--3,29)),
+                           /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,15--3,16),
                            Some
-                             /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,29--2,30),
-                           /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,15--2,30))),
+                             /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,29--3,30),
+                           /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,15--3,30))),
                      Const
                        (Unit,
-                        /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,34--2,36)),
-                     /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,2--2,36),
+                        /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,34--3,36)),
+                     /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,2--3,36),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,31--2,33)
+                          /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,31--3,33)
                        BarRange =
                         Some
-                          /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--2,1) })],
-                 /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (1,0--2,36),
+                          /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,0--3,1) })],
+                 /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--3,36),
                  { MatchKeyword =
-                    /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (1,0--1,5)
+                    /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--2,5)
                    WithKeyword =
-                    /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (1,10--1,14) }),
-              /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (1,0--2,36))],
+                    /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,10--2,14) }),
+              /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--3,36))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (1,0--2,36),
+          /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttribute.fs b/tests/service/data/SyntaxTree/RangeOfAttribute.fs
index 11b4435298e..f69eaad8c30 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttribute.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttribute.fs
@@ -1,2 +1,3 @@
+
 [<MyAttribute(foo ="bar")>]
-do ()
\ No newline at end of file
+do ()
diff --git a/tests/service/data/SyntaxTree/RangeOfAttribute.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttribute.fs.bsl
index 8b360bbb0bb..699ccd67585 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttribute.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttribute.fs.bsl
@@ -18,27 +18,27 @@ ImplFile
                                   SynLongIdent
                                     ([op_Equality], [],
                                      [Some (OriginalNotation "=")]), None,
-                                  /root/RangeOfAttribute.fs (1,18--1,19)),
-                               Ident foo, /root/RangeOfAttribute.fs (1,14--1,19)),
+                                  /root/RangeOfAttribute.fs (2,18--2,19)),
+                               Ident foo, /root/RangeOfAttribute.fs (2,14--2,19)),
                             Const
                               (String
                                  ("bar", Regular,
-                                  /root/RangeOfAttribute.fs (1,19--1,24)),
-                               /root/RangeOfAttribute.fs (1,19--1,24)),
-                            /root/RangeOfAttribute.fs (1,14--1,24)),
-                         /root/RangeOfAttribute.fs (1,13--1,14),
-                         Some /root/RangeOfAttribute.fs (1,24--1,25),
-                         /root/RangeOfAttribute.fs (1,13--1,25))
+                                  /root/RangeOfAttribute.fs (2,19--2,24)),
+                               /root/RangeOfAttribute.fs (2,19--2,24)),
+                            /root/RangeOfAttribute.fs (2,14--2,24)),
+                         /root/RangeOfAttribute.fs (2,13--2,14),
+                         Some /root/RangeOfAttribute.fs (2,24--2,25),
+                         /root/RangeOfAttribute.fs (2,13--2,25))
                      Target = None
                      AppliesToGetterAndSetter = false
-                     Range = /root/RangeOfAttribute.fs (1,2--1,25) }]
-                 Range = /root/RangeOfAttribute.fs (1,0--1,27) }],
-              /root/RangeOfAttribute.fs (1,0--1,27));
+                     Range = /root/RangeOfAttribute.fs (2,2--2,25) }]
+                 Range = /root/RangeOfAttribute.fs (2,0--2,27) }],
+              /root/RangeOfAttribute.fs (2,0--2,27));
            Expr
              (Do
-                (Const (Unit, /root/RangeOfAttribute.fs (2,3--2,5)),
-                 /root/RangeOfAttribute.fs (2,0--2,5)),
-              /root/RangeOfAttribute.fs (2,0--2,5))], PreXmlDocEmpty, [], None,
-          /root/RangeOfAttribute.fs (1,0--2,5), { LeadingKeyword = None })],
+                (Const (Unit, /root/RangeOfAttribute.fs (3,3--3,5)),
+                 /root/RangeOfAttribute.fs (3,0--3,5)),
+              /root/RangeOfAttribute.fs (3,0--3,5))], PreXmlDocEmpty, [], None,
+          /root/RangeOfAttribute.fs (2,0--4,0), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs b/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs
index 4ab8706c2ad..e43b84670d7 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs
@@ -1 +1,2 @@
-let [<Literal>] (A x) = 1
\ No newline at end of file
+
+let [<Literal>] (A x) = 1
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
index 89df33be436..36cb7ae4a44 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
@@ -17,14 +17,14 @@ ImplFile
                          ArgExpr =
                           Const
                             (Unit,
-                             /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,6--1,13))
+                             /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,6--2,13))
                          Target = None
                          AppliesToGetterAndSetter = false
                          Range =
-                          /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,6--1,13) }]
+                          /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,6--2,13) }]
                      Range =
-                      /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,4--1,15) }],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                      /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,4--2,15) }],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Paren
@@ -33,27 +33,27 @@ ImplFile
                         Pats
                           [Named
                              (SynIdent (x, None), false, None,
-                              /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,19--1,20))],
+                              /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,19--2,20))],
                         None,
-                        /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,17--1,20)),
-                     /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,16--1,21)),
+                        /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,17--2,20)),
+                     /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,16--2,21)),
                   None,
                   Const
                     (Int32 1,
-                     /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,24--1,25)),
-                  /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,4--1,21),
+                     /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,24--2,25)),
+                  /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,4--2,21),
                   Yes
-                    /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,0--1,25),
+                    /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,25),
                   { LeadingKeyword =
                      Let
-                       /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,0--1,3)
+                       /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,22--1,23) })],
-              /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,0--1,25))],
+                       /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,22--2,23) })],
+              /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,25))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (1,0--1,25),
+          /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs
index f6f73c86be0..9bb4ca905fe 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs
@@ -1,3 +1,4 @@
+
 { new System.Object() with
     [<Foo>]
-    member x.ToString() = "F#" }
\ No newline at end of file
+    member x.ToString() = "F#" }
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
index 008d9a4cf7c..6659da43598 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
@@ -12,15 +12,15 @@ ImplFile
                 (LongIdent
                    (SynLongIdent
                       ([System; Object],
-                       [/root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,12--1,13)],
+                       [/root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,12--2,13)],
                        [None; None])),
                  Some
                    (Const
                       (Unit,
-                       /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,19--1,21)),
+                       /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,19--2,21)),
                     None),
                  Some
-                   /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,22--1,26),
+                   /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,22--2,26),
                  [],
                  [Member
                     (SynBinding
@@ -30,14 +30,14 @@ ImplFile
                                ArgExpr =
                                 Const
                                   (Unit,
-                                   /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,6--2,9))
+                                   /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,6--3,9))
                                Target = None
                                AppliesToGetterAndSetter = false
                                Range =
-                                /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,6--2,9) }]
+                                /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,6--3,9) }]
                            Range =
-                            /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,4--2,11) }],
-                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,4--3,11) }],
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (Some { IsInstance = true
                                   IsDispatchSlot = false
@@ -51,38 +51,38 @@ ImplFile
                         LongIdent
                           (SynLongIdent
                              ([x; ToString],
-                              [/root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,12--3,13)],
+                              [/root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,12--4,13)],
                               [None; None]), None, None,
                            Pats
                              [Paren
                                 (Const
                                    (Unit,
-                                    /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,21--3,23)),
-                                 /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,21--3,23))],
+                                    /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,21--4,23)),
+                                 /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,21--4,23))],
                            None,
-                           /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,11--3,23)),
+                           /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,11--4,23)),
                         None,
                         Const
                           (String
                              ("F#", Regular,
-                              /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,26--3,30)),
-                           /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,26--3,30)),
-                        /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,4--3,23),
+                              /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,26--4,30)),
+                           /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,26--4,30)),
+                        /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,4--4,23),
                         NoneAtInvisible,
                         { LeadingKeyword =
                            Member
-                             /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,4--3,10)
+                             /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,4--4,10)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,24--3,25) }),
-                     /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,4--3,30))],
+                             /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,24--4,25) }),
+                     /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,4--4,30))],
                  [],
-                 /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,2--1,21),
-                 /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,0--3,32)),
-              /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,0--3,32))],
+                 /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,2--2,21),
+                 /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,0--4,32)),
+              /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,0--4,32))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (1,0--3,32),
+          /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,0--4,32),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs
index 71d548b6759..d2bce2b4d3c 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs
@@ -1,3 +1,4 @@
+
 type Tiger =
     [<Foo>]
-    new () as tony = ()
\ No newline at end of file
+    new () as tony = ()
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs.bsl
index b984723dd3f..4dae7c02a4e 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs.bsl
@@ -12,9 +12,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Tiger],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (1,5--1,10)),
+                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,5--2,10)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -25,14 +25,14 @@ ImplFile
                                    ArgExpr =
                                     Const
                                       (Unit,
-                                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,6--2,9))
+                                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,6--3,9))
                                    Target = None
                                    AppliesToGetterAndSetter = false
                                    Range =
-                                    /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,6--2,9) }]
+                                    /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,6--3,9) }]
                                Range =
-                                /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,4--2,11) }],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                                /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,4--3,11) }],
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = false
                                       IsDispatchSlot = false
@@ -49,37 +49,37 @@ ImplFile
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,8--3,10)),
-                                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,8--3,10))],
+                                        /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (4,8--4,10)),
+                                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (4,8--4,10))],
                                None,
-                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,4--3,7)),
+                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (4,4--4,7)),
                             None,
                             Const
                               (Unit,
-                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,21--3,23)),
-                            /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,4--3,18),
+                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (4,21--4,23)),
+                            /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,4--4,18),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                New
-                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,4--3,7)
+                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (4,4--4,7)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,19--3,20) }),
-                         /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,4--3,23))],
-                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,4--3,23)),
+                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (4,19--4,20) }),
+                         /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,4--4,23))],
+                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,4--4,23)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (1,5--3,23),
+                  /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,5--4,23),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (1,0--1,4)
+                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (1,11--1,12)
+                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (1,0--3,23))],
+              /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,0--4,23))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (1,0--3,23),
+          /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs
index e671c2e6802..3341a1f8535 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs
@@ -1,3 +1,4 @@
+
 type Tiger =
     [<Foo>]
-    new () = ()
\ No newline at end of file
+    new () = ()
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
index c62548218f6..8dd7cc53f03 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
@@ -11,9 +11,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Tiger],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (1,5--1,10)),
+                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,5--2,10)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -24,14 +24,14 @@ ImplFile
                                    ArgExpr =
                                     Const
                                       (Unit,
-                                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,6--2,9))
+                                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,6--3,9))
                                    Target = None
                                    AppliesToGetterAndSetter = false
                                    Range =
-                                    /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,6--2,9) }]
+                                    /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,6--3,9) }]
                                Range =
-                                /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,4--2,11) }],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                                /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--3,11) }],
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = false
                                       IsDispatchSlot = false
@@ -48,37 +48,37 @@ ImplFile
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,8--3,10)),
-                                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,8--3,10))],
+                                        /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,8--4,10)),
+                                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,8--4,10))],
                                None,
-                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--3,7)),
+                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,4--4,7)),
                             None,
                             Const
                               (Unit,
-                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,13--3,15)),
-                            /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,4--3,10),
+                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,13--4,15)),
+                            /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--4,10),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                New
-                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--3,7)
+                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,4--4,7)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,11--3,12) }),
-                         /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,4--3,15))],
-                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,4--3,15)),
+                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,11--4,12) }),
+                         /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--4,15))],
+                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--4,15)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (1,5--3,15),
+                  /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,5--4,15),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (1,0--1,4)
+                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (1,11--1,12)
+                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (1,0--3,15))],
+              /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,0--4,15))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (1,0--3,15),
+          /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs
index b34c759c0e0..10f315ed114 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs
@@ -1,5 +1,6 @@
+
 type Bird =
     [<Foo>]
     member this.TheWord
         with get () = myInternalValue
-        and set (value) = myInternalValue <- value
\ No newline at end of file
+        and set (value) = myInternalValue <- value
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
index c94a2eb6c39..84e30805cd4 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
@@ -12,9 +12,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Bird],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (1,5--1,9)),
+                     /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,5--2,9)),
                   ObjectModel
                     (Unspecified,
                      [GetSetMember
@@ -27,15 +27,15 @@ ImplFile
                                       ArgExpr =
                                        Const
                                          (Unit,
-                                          /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,6--2,9))
+                                          /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,6--3,9))
                                       Target = None
                                       AppliesToGetterAndSetter = false
                                       Range =
-                                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,6--2,9) }]
+                                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,6--3,9) }]
                                   Range =
-                                   /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,4--2,11) }],
+                                   /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--3,11) }],
                                PreXmlMerge
-  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -50,26 +50,26 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; TheWord],
-                                     [/root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,15--3,16)],
+                                     [/root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,15--4,16)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,17--4,19)),
-                                        /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,17--4,19))],
+                                           /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,17--5,19)),
+                                        /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,17--5,19))],
                                   None,
-                                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,13--4,19)),
+                                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,13--5,19)),
                                None, Ident myInternalValue,
-                               /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,4--4,19),
+                               /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--5,19),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--3,10)
+                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,20--4,21) })),
+                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,20--5,21) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false,
@@ -79,15 +79,15 @@ ImplFile
                                       ArgExpr =
                                        Const
                                          (Unit,
-                                          /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,6--2,9))
+                                          /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,6--3,9))
                                       Target = None
                                       AppliesToGetterAndSetter = false
                                       Range =
-                                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,6--2,9) }]
+                                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,6--3,9) }]
                                   Range =
-                                   /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,4--2,11) }],
+                                   /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--3,11) }],
                                PreXmlMerge
-  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -103,56 +103,56 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; TheWord],
-                                     [/root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,15--3,16)],
+                                     [/root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,15--4,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Named
                                           (SynIdent (value, None), false, None,
-                                           /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,17--5,22)),
-                                        /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,16--5,23))],
+                                           /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,17--6,22)),
+                                        /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,16--6,23))],
                                   None,
-                                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,12--5,23)),
+                                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,12--6,23)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([myInternalValue], [], [None]),
                                   Ident value,
-                                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,26--5,50)),
-                               /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,4--5,23),
+                                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,26--6,50)),
+                               /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--6,23),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--3,10)
+                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,24--5,25) })),
-                         /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,4--5,50),
+                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,24--6,25) })),
+                         /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--6,50),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,8--4,12)
+                            /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,8--5,12)
                            GetKeyword =
                             Some
-                              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,13--4,16)
+                              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,13--5,16)
                            AndKeyword =
                             Some
-                              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,8--5,11)
+                              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,8--6,11)
                            SetKeyword =
                             Some
-                              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,12--5,15) })],
-                     /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,4--5,50)),
+                              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,12--6,15) })],
+                     /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--6,50)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (1,5--5,50),
+                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,5--6,50),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (1,0--1,4)
+                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (1,10--1,11)
+                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,10--2,11)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (1,0--5,50))],
+              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,0--6,50))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (1,0--5,50),
+          /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs
index 46e0edfa75d..1c3d68846ca 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs
@@ -1,3 +1,4 @@
+
 type T() =
     new () =
         T ()
@@ -7,4 +8,4 @@ type T() =
 
     [<Foo>]
     new () =
-        T ()
\ No newline at end of file
+        T ()
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
index 29e5c3fb544..786b61bca3a 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
@@ -10,24 +10,24 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [T],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,5--1,6)),
+                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,6--1,8)),
+                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,6--2,8)),
                          None,
-                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,5--1,6),
+                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,5--2,6),
                          { AsKeyword = None });
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = false
                                       IsDispatchSlot = false
@@ -44,31 +44,31 @@ ImplFile
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,8--2,10)),
-                                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,8--2,10))],
+                                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,8--3,10)),
+                                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,8--3,10))],
                                None,
-                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,4--2,7)),
+                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--3,7)),
                             None,
                             App
                               (NonAtomic, false, Ident T,
                                Const
                                  (Unit,
-                                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,10--3,12)),
-                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,8--3,12)),
-                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,4--2,10),
+                                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (4,10--4,12)),
+                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (4,8--4,12)),
+                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--3,10),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                New
-                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,4--2,7)
+                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--3,7)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,11--2,12) }),
-                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,4--3,12));
+                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,11--3,12) }),
+                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--4,12));
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = false
                                       IsDispatchSlot = false
@@ -85,29 +85,29 @@ ImplFile
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,17--5,19)),
-                                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,17--5,19))],
+                                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,17--6,19)),
+                                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,17--6,19))],
                                Some
                                  (Internal
-                                    /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,4--5,12)),
-                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,13--5,16)),
+                                    /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,4--6,12)),
+                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,13--6,16)),
                             None,
                             App
                               (NonAtomic, false, Ident T,
                                Const
                                  (Unit,
-                                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,10--6,12)),
-                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,8--6,12)),
-                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,4--5,19),
+                                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (7,10--7,12)),
+                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (7,8--7,12)),
+                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,4--6,19),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                New
-                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,13--5,16)
+                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,13--6,16)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,20--5,21) }),
-                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (5,4--6,12));
+                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,20--6,21) }),
+                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,4--7,12));
                       Member
                         (SynBinding
                            (None, Normal, false, false,
@@ -116,14 +116,14 @@ ImplFile
                                    ArgExpr =
                                     Const
                                       (Unit,
-                                       /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (8,6--8,9))
+                                       /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,6--9,9))
                                    Target = None
                                    AppliesToGetterAndSetter = false
                                    Range =
-                                    /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (8,6--8,9) }]
+                                    /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,6--9,9) }]
                                Range =
-                                /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (8,4--8,11) }],
-                            PreXmlDoc ((8,4), FSharp.Compiler.Xml.XmlDocCollector),
+                                /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,4--9,11) }],
+                            PreXmlDoc ((9,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = false
                                       IsDispatchSlot = false
@@ -140,50 +140,50 @@ ImplFile
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,8--9,10)),
-                                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,8--9,10))],
+                                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,8--10,10)),
+                                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,8--10,10))],
                                None,
-                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,4--9,7)),
+                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,4--10,7)),
                             None,
                             App
                               (NonAtomic, false, Ident T,
                                Const
                                  (Unit,
-                                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,10--10,12)),
-                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,8--10,12)),
-                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (8,4--9,10),
+                                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (11,10--11,12)),
+                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (11,8--11,12)),
+                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,4--10,10),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                New
-                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,4--9,7)
+                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,4--10,7)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,11--9,12) }),
-                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (8,4--10,12))],
-                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,4--10,12)),
+                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,11--10,12) }),
+                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,4--11,12))],
+                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--11,12)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,6--1,8)),
+                           /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,6--2,8)),
                         None,
-                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,5--1,6),
+                        PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,5--10,12),
+                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,5--11,12),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,0--1,4)
+                       /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,9--1,10)
+                       /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,0--10,12))],
+              /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,0--11,12))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (1,0--10,12),
+          /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,0--12,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi
index bb1e058ae90..801c841cf41 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi
@@ -1,5 +1,6 @@
+
 module internal FSharp.Compiler.ParseHelpers
 
 // The error raised by the parse_error_rich function, which is called by the parser engine
 [<NoEquality; NoComparison>]
-exception SyntaxError of obj * range: range
\ No newline at end of file
+exception SyntaxError of obj * range: range
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
index 6c06cd9e9ff..8511cbfea33 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
@@ -12,57 +12,57 @@ SigFile
                            ArgExpr =
                             Const
                               (Unit,
-                               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,2--4,12))
+                               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,2--5,12))
                            Target = None
                            AppliesToGetterAndSetter = false
                            Range =
-                            /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,2--4,12) };
+                            /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,2--5,12) };
                          { TypeName = SynLongIdent ([NoComparison], [], [None])
                            ArgExpr =
                             Const
                               (Unit,
-                               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,14--4,26))
+                               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,14--5,26))
                            Target = None
                            AppliesToGetterAndSetter = false
                            Range =
-                            /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,14--4,26) }]
+                            /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,14--5,26) }]
                        Range =
-                        /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,0--4,28) }],
+                        /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,0--5,28) }],
                     SynUnionCase
                       ([], SynIdent (SyntaxError, None),
                        Fields
                          [SynField
                             ([], false, None,
                              LongIdent (SynLongIdent ([obj], [], [None])), false,
-                             PreXmlDoc ((5,25), FSharp.Compiler.Xml.XmlDocCollector),
+                             PreXmlDoc ((6,25), FSharp.Compiler.Xml.XmlDocCollector),
                              None,
-                             /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,25--5,28),
+                             /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (6,25--6,28),
                              { LeadingKeyword = None });
                           SynField
                             ([], false, Some range,
                              LongIdent (SynLongIdent ([range], [], [None])),
                              false,
-                             PreXmlDoc ((5,31), FSharp.Compiler.Xml.XmlDocCollector),
+                             PreXmlDoc ((6,31), FSharp.Compiler.Xml.XmlDocCollector),
                              None,
-                             /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,31--5,43),
+                             /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (6,31--6,43),
                              { LeadingKeyword = None })], PreXmlDocEmpty, None,
-                       /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,10--5,43),
+                       /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (6,10--6,43),
                        { BarRange = None }), None,
-                    PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                    /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,0--5,43)),
+                    PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                    /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,0--6,43)),
                  None, [],
-                 /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,0--5,43)),
-              /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,0--5,43))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [],
+                 /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,0--6,43)),
+              /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,0--6,43))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [],
           Some
             (Internal
-               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (1,7--1,15)),
-          /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (1,0--5,43),
+               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (2,7--2,15)),
+          /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (2,0--6,43),
           { LeadingKeyword =
              Module
-               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (1,0--1,6) })],
+               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (3,0--3,90)] },
+            /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,0--4,90)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs
index b408af23d01..8107e33c3d3 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs
@@ -1,3 +1,4 @@
+
 type Bar =
     [<Foo>]
-    let x = 8
\ No newline at end of file
+    let x = 8
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
index c7d43fc5bf8..b9319d007bb 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
@@ -11,9 +11,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Bar],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (1,5--1,8)),
+                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [LetBindings
@@ -24,50 +24,50 @@ ImplFile
                                     ArgExpr =
                                      Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,6--2,9))
+                                        /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,6--3,9))
                                     Target = None
                                     AppliesToGetterAndSetter = false
                                     Range =
-                                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,6--2,9) }]
+                                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,6--3,9) }]
                                 Range =
-                                 /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,4--2,11) }],
-                             PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                                 /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--3,11) }],
+                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
                                 None),
                              Named
                                (SynIdent (x, None), false, None,
-                                /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,8--3,9)),
+                                /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (4,8--4,9)),
                              None,
                              Const
                                (Int32 8,
-                                /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,12--3,13)),
-                             /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,4--3,9),
+                                /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (4,12--4,13)),
+                             /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--4,9),
                              Yes
-                               /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,4--3,13),
+                               /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--4,13),
                              { LeadingKeyword =
                                 Let
-                                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--3,7)
+                                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (4,4--4,7)
                                InlineKeyword = None
                                EqualsRange =
                                 Some
-                                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,10--3,11) })],
+                                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (4,10--4,11) })],
                          false, false,
-                         /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,4--3,13))],
-                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,4--3,13)),
+                         /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--4,13))],
+                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--4,13)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (1,5--3,13),
+                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,5--4,13),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (1,0--1,4)
+                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (1,9--1,10)
+                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (1,0--3,13))],
+              /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,0--4,13))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (1,0--3,13),
+          /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs
index 53d833863b1..76ff6013b60 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs
@@ -1,3 +1,4 @@
+
 type Bar =
     [<Foo>]
-    member this.Something () = ()
\ No newline at end of file
+    member this.Something () = ()
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
index 193fb4e0947..441f359e279 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
@@ -10,9 +10,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Bar],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (1,5--1,8)),
+                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -23,14 +23,14 @@ ImplFile
                                    ArgExpr =
                                     Const
                                       (Unit,
-                                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,6--2,9))
+                                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,6--3,9))
                                    Target = None
                                    AppliesToGetterAndSetter = false
                                    Range =
-                                    /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,6--2,9) }]
+                                    /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,6--3,9) }]
                                Range =
-                                /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,4--2,11) }],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                                /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--3,11) }],
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -44,43 +44,43 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; Something],
-                                  [/root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,15--3,16)],
+                                  [/root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,15--4,16)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,26--3,28)),
-                                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,26--3,28))],
+                                        /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,26--4,28)),
+                                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,26--4,28))],
                                None,
-                               /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,11--3,28)),
+                               /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,11--4,28)),
                             None,
                             Const
                               (Unit,
-                               /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,31--3,33)),
-                            /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,4--3,28),
+                               /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,31--4,33)),
+                            /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--4,28),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--3,10)
+                                 /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,4--4,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,29--3,30) }),
-                         /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,4--3,33))],
-                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,4--3,33)),
+                                 /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,29--4,30) }),
+                         /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--4,33))],
+                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--4,33)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (1,5--3,33),
+                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,5--4,33),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (1,0--1,4)
+                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (1,9--1,10)
+                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (1,0--3,33))],
+              /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,0--4,33))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (1,0--3,33),
+          /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs
index fbbe968e935..c03e66b4e7f 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs
@@ -1,2 +1,3 @@
+
 [<Foo>]
-let a = 0
\ No newline at end of file
+let a = 0
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
index 1d67c442016..9299162a68f 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
@@ -15,36 +15,36 @@ ImplFile
                          ArgExpr =
                           Const
                             (Unit,
-                             /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,2--1,5))
+                             /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,2--2,5))
                          Target = None
                          AppliesToGetterAndSetter = false
                          Range =
-                          /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,2--1,5) }]
+                          /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,2--2,5) }]
                      Range =
-                      /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,0--1,7) }],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                      /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,7) }],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (a, None), false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,4--2,5)),
+                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (3,4--3,5)),
                   None,
                   Const
                     (Int32 0,
-                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,8--2,9)),
-                  /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,0--2,5),
+                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (3,8--3,9)),
+                  /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--3,5),
                   Yes
-                    /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,0--2,9),
+                    /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--3,9),
                   { LeadingKeyword =
                      Let
-                       /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,3)
+                       /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (3,0--3,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,6--2,7) })],
-              /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,0--2,9))],
+                       /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (3,6--3,7) })],
+              /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--3,9))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (1,0--2,9),
+          /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs
index a354f809420..a7602205fd1 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs
@@ -1,5 +1,6 @@
+
 module TopLevel
 
 [<Foo>]
 module Nested =
-    ()
\ No newline at end of file
+    ()
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
index a8e455424bd..e7d4baa9778 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
@@ -11,35 +11,35 @@ ImplFile
                         ArgExpr =
                          Const
                            (Unit,
-                            /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (3,2--3,5))
+                            /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,2--4,5))
                         Target = None
                         AppliesToGetterAndSetter = false
                         Range =
-                         /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (3,2--3,5) }]
+                         /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,2--4,5) }]
                     Range =
-                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (3,0--3,7) }],
+                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,0--4,7) }],
                  None, [], [Nested],
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,0--4,13)),
+                 /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (5,0--5,13)),
               false,
               [Expr
                  (Const
                     (Unit,
-                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (5,4--5,6)),
-                  /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (5,4--5,6))],
+                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (6,4--6,6)),
+                  /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (6,4--6,6))],
               false,
-              /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (3,0--5,6),
+              /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,0--6,6),
               { ModuleKeyword =
                  Some
-                   /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,0--4,6)
+                   /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (5,0--5,6)
                 EqualsRange =
                  Some
-                   /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,14--4,15) })],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (1,0--5,6),
+                   /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (5,14--5,15) })],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (2,0--6,6),
           { LeadingKeyword =
              Module
-               /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (1,0--1,6) })],
+               /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (2,0--2,6) })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi
index 57bcc6ad8ed..0ff493d1cd6 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi
@@ -1,5 +1,6 @@
+
 namespace SomeNamespace
 
 [<Foo>]
 module Nested =
-    val x : int
\ No newline at end of file
+    val x : int
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
index 4f5fbc329b5..4e1d5fd2b6c 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
@@ -12,44 +12,44 @@ SigFile
                         ArgExpr =
                          Const
                            (Unit,
-                            /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (3,2--3,5))
+                            /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,2--4,5))
                         Target = None
                         AppliesToGetterAndSetter = false
                         Range =
-                         /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (3,2--3,5) }]
+                         /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,2--4,5) }]
                     Range =
-                     /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (3,0--3,7) }],
+                     /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,0--4,7) }],
                  None, [], [Nested],
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,0--4,13)),
+                 /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,0--5,13)),
               false,
               [Val
                  (SynValSig
                     ([], SynIdent (x, None), SynValTyparDecls (None, true),
                      LongIdent (SynLongIdent ([int], [], [None])),
                      SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                     PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                      None, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,4--5,15),
+                     /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (6,4--6,15),
                      { LeadingKeyword =
                         Val
-                          /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,4--5,7)
+                          /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (6,4--6,7)
                        InlineKeyword = None
                        WithKeyword = None
                        EqualsRange = None }),
-                  /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,4--5,15))],
-              /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (3,0--5,15),
+                  /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (6,4--6,15))],
+              /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,0--6,15),
               { ModuleKeyword =
                  Some
-                   /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,0--4,6)
+                   /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,0--5,6)
                 EqualsRange =
                  Some
-                   /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,14--4,15) })],
+                   /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,14--5,15) })],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (1,0--5,15),
+          /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (2,0--6,15),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (1,0--1,9) })],
+               /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs
index 853c817ceb5..7a83c9e4e88 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs
@@ -1,4 +1,5 @@
+
 [<Foo>]
 type Bar =
     class
-    end
\ No newline at end of file
+    end
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
index 887e284f1a2..ca301d0c57b 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
@@ -12,32 +12,32 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (1,2--1,5))
+                                /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,2--2,5))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (1,2--1,5) }]
+                             /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,2--2,5) }]
                         Range =
-                         /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (1,0--1,7) }],
+                         /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--2,7) }],
                      None, [], [Bar],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,5--2,8)),
+                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (3,5--3,8)),
                   ObjectModel
                     (Class, [],
-                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (3,4--4,7)),
+                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (4,4--5,7)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (1,0--4,7),
+                  /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--5,7),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--2,4)
+                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (3,0--3,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,9--2,10)
+                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (3,9--3,10)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (1,0--4,7))],
+              /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--5,7))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (1,0--4,7),
+          /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi
index adb81ff8191..38fa79042fa 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi
@@ -1,6 +1,7 @@
+
 namespace SomeNamespace
 
 [<Foo1>]
 type MyType =
     class
-    end
\ No newline at end of file
+    end
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
index fc8456cb3d1..a4755ceea82 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
@@ -13,34 +13,34 @@ SigFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (3,2--3,6))
+                                /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,2--4,6))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (3,2--3,6) }]
+                             /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,2--4,6) }]
                         Range =
-                         /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (3,0--3,8) }],
+                         /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,0--4,8) }],
                      None, [], [MyType],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,5--4,11)),
+                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (5,5--5,11)),
                   ObjectModel
                     (Class, [],
-                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (5,4--6,7)),
+                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (6,4--7,7)),
                   [],
-                  /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (3,0--6,7),
+                  /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,0--7,7),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,0--4,4)
+                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (5,0--5,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,12--4,13)
+                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (5,12--5,13)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (3,0--6,7))],
+              /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,0--7,7))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (1,0--6,7),
+          /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (2,0--7,7),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (1,0--1,9) })],
+               /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi
index 3694c833447..1396c98e5eb 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi
@@ -1,5 +1,6 @@
+
 namespace SomeNamespace
 
 type FooType =
     [<Foo2>] // ValSpfn
-    abstract x : int
\ No newline at end of file
+    abstract x : int
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
index 3a6f397bb09..4fccca46d78 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
@@ -9,9 +9,9 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [FooType],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (3,5--3,12)),
+                     /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,5--4,12)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -21,23 +21,23 @@ SigFile
                                    ArgExpr =
                                     Const
                                       (Unit,
-                                       /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,6--4,10))
+                                       /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,6--5,10))
                                    Target = None
                                    AppliesToGetterAndSetter = false
                                    Range =
-                                    /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,6--4,10) }]
+                                    /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,6--5,10) }]
                                Range =
-                                /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,4--4,12) }],
+                                /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--5,12) }],
                             SynIdent (x, None), SynValTyparDecls (None, true),
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,4--5,20),
+                            /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--6,20),
                             { LeadingKeyword =
                                Abstract
-                                 /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--5,12)
+                                 /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (6,4--6,12)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -47,26 +47,26 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,4--5,20),
+                         /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--6,20),
                          { GetSetKeywords = None })],
-                     /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,4--5,20)),
+                     /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--6,20)),
                   [],
-                  /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (3,5--5,20),
+                  /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,5--6,20),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (3,0--3,4)
+                       /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (3,13--3,14)
+                       /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,13--4,14)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (3,0--5,20))],
+              /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,0--6,20))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (1,0--5,20),
+          /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (2,0--6,20),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (1,0--1,9) })],
+               /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,13--4,23)] },
+            /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,13--5,23)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs
index ddcee340b70..8f973370376 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs
@@ -1,3 +1,4 @@
+
 type Crane =
     [<Foo>]
-    member this.MyWriteOnlyProperty with set (value) = myInternalValue <- value
\ No newline at end of file
+    member this.MyWriteOnlyProperty with set (value) = myInternalValue <- value
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
index a3fb9c3f834..eac4f828c51 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
@@ -12,9 +12,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Crane],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (1,5--1,10)),
+                     /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,5--2,10)),
                   ObjectModel
                     (Unspecified,
                      [GetSetMember
@@ -28,15 +28,15 @@ ImplFile
                                       ArgExpr =
                                        Const
                                          (Unit,
-                                          /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,6--2,9))
+                                          /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,6--3,9))
                                       Target = None
                                       AppliesToGetterAndSetter = false
                                       Range =
-                                       /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,6--2,9) }]
+                                       /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,6--3,9) }]
                                   Range =
-                                   /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,4--2,11) }],
+                                   /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--3,11) }],
                                PreXmlMerge
-  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -52,52 +52,52 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyWriteOnlyProperty],
-                                     [/root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,15--3,16)],
+                                     [/root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,15--4,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Named
                                           (SynIdent (value, None), false, None,
-                                           /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,46--3,51)),
-                                        /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,45--3,52))],
+                                           /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,46--4,51)),
+                                        /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,45--4,52))],
                                   None,
-                                  /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,41--3,52)),
+                                  /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,41--4,52)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([myInternalValue], [], [None]),
                                   Ident value,
-                                  /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,55--3,79)),
-                               /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,4--3,52),
+                                  /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,55--4,79)),
+                               /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--4,52),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--3,10)
+                                    /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,53--3,54) })),
-                         /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,4--3,79),
+                                    /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,53--4,54) })),
+                         /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--4,79),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,36--3,40)
+                            /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,36--4,40)
                            GetKeyword = None
                            AndKeyword = None
                            SetKeyword =
                             Some
-                              /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,41--3,44) })],
-                     /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,4--3,79)),
+                              /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,41--4,44) })],
+                     /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--4,79)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (1,5--3,79),
+                  /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,5--4,79),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (1,0--1,4)
+                       /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (1,11--1,12)
+                       /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (1,0--3,79))],
+              /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,0--4,79))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (1,0--3,79),
+          /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs b/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs
index af2999f9930..28f76cbf663 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs
@@ -1,2 +1,3 @@
+
 [<Prefix.MyAttribute(foo ="bar")>]
-do ()
\ No newline at end of file
+do ()
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs.bsl
index 3ca5db58ed3..631d7674f01 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs.bsl
@@ -9,7 +9,7 @@ ImplFile
                   [{ TypeName =
                       SynLongIdent
                         ([Prefix; MyAttribute],
-                         [/root/RangeOfAttributeWithPath.fs (1,8--1,9)],
+                         [/root/RangeOfAttributeWithPath.fs (2,8--2,9)],
                          [None; None])
                      ArgExpr =
                       Paren
@@ -22,29 +22,29 @@ ImplFile
                                   SynLongIdent
                                     ([op_Equality], [],
                                      [Some (OriginalNotation "=")]), None,
-                                  /root/RangeOfAttributeWithPath.fs (1,25--1,26)),
+                                  /root/RangeOfAttributeWithPath.fs (2,25--2,26)),
                                Ident foo,
-                               /root/RangeOfAttributeWithPath.fs (1,21--1,26)),
+                               /root/RangeOfAttributeWithPath.fs (2,21--2,26)),
                             Const
                               (String
                                  ("bar", Regular,
-                                  /root/RangeOfAttributeWithPath.fs (1,26--1,31)),
-                               /root/RangeOfAttributeWithPath.fs (1,26--1,31)),
-                            /root/RangeOfAttributeWithPath.fs (1,21--1,31)),
-                         /root/RangeOfAttributeWithPath.fs (1,20--1,21),
-                         Some /root/RangeOfAttributeWithPath.fs (1,31--1,32),
-                         /root/RangeOfAttributeWithPath.fs (1,20--1,32))
+                                  /root/RangeOfAttributeWithPath.fs (2,26--2,31)),
+                               /root/RangeOfAttributeWithPath.fs (2,26--2,31)),
+                            /root/RangeOfAttributeWithPath.fs (2,21--2,31)),
+                         /root/RangeOfAttributeWithPath.fs (2,20--2,21),
+                         Some /root/RangeOfAttributeWithPath.fs (2,31--2,32),
+                         /root/RangeOfAttributeWithPath.fs (2,20--2,32))
                      Target = None
                      AppliesToGetterAndSetter = false
-                     Range = /root/RangeOfAttributeWithPath.fs (1,2--1,32) }]
-                 Range = /root/RangeOfAttributeWithPath.fs (1,0--1,34) }],
-              /root/RangeOfAttributeWithPath.fs (1,0--1,34));
+                     Range = /root/RangeOfAttributeWithPath.fs (2,2--2,32) }]
+                 Range = /root/RangeOfAttributeWithPath.fs (2,0--2,34) }],
+              /root/RangeOfAttributeWithPath.fs (2,0--2,34));
            Expr
              (Do
-                (Const (Unit, /root/RangeOfAttributeWithPath.fs (2,3--2,5)),
-                 /root/RangeOfAttributeWithPath.fs (2,0--2,5)),
-              /root/RangeOfAttributeWithPath.fs (2,0--2,5))], PreXmlDocEmpty, [],
-          None, /root/RangeOfAttributeWithPath.fs (1,0--2,5),
+                (Const (Unit, /root/RangeOfAttributeWithPath.fs (3,3--3,5)),
+                 /root/RangeOfAttributeWithPath.fs (3,0--3,5)),
+              /root/RangeOfAttributeWithPath.fs (3,0--3,5))], PreXmlDocEmpty, [],
+          None, /root/RangeOfAttributeWithPath.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs b/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs
index ef664101455..1f4386b43e6 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs
@@ -1,2 +1,3 @@
+
 [<assembly: MyAttribute(foo ="bar")>]
-do ()
\ No newline at end of file
+do ()
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs.bsl
index 69433673523..d69c1b4acd9 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs.bsl
@@ -18,29 +18,29 @@ ImplFile
                                   SynLongIdent
                                     ([op_Equality], [],
                                      [Some (OriginalNotation "=")]), None,
-                                  /root/RangeOfAttributeWithTarget.fs (1,28--1,29)),
+                                  /root/RangeOfAttributeWithTarget.fs (2,28--2,29)),
                                Ident foo,
-                               /root/RangeOfAttributeWithTarget.fs (1,24--1,29)),
+                               /root/RangeOfAttributeWithTarget.fs (2,24--2,29)),
                             Const
                               (String
                                  ("bar", Regular,
-                                  /root/RangeOfAttributeWithTarget.fs (1,29--1,34)),
-                               /root/RangeOfAttributeWithTarget.fs (1,29--1,34)),
-                            /root/RangeOfAttributeWithTarget.fs (1,24--1,34)),
-                         /root/RangeOfAttributeWithTarget.fs (1,23--1,24),
-                         Some /root/RangeOfAttributeWithTarget.fs (1,34--1,35),
-                         /root/RangeOfAttributeWithTarget.fs (1,23--1,35))
+                                  /root/RangeOfAttributeWithTarget.fs (2,29--2,34)),
+                               /root/RangeOfAttributeWithTarget.fs (2,29--2,34)),
+                            /root/RangeOfAttributeWithTarget.fs (2,24--2,34)),
+                         /root/RangeOfAttributeWithTarget.fs (2,23--2,24),
+                         Some /root/RangeOfAttributeWithTarget.fs (2,34--2,35),
+                         /root/RangeOfAttributeWithTarget.fs (2,23--2,35))
                      Target = Some assembly
                      AppliesToGetterAndSetter = false
-                     Range = /root/RangeOfAttributeWithTarget.fs (1,2--1,35) }]
-                 Range = /root/RangeOfAttributeWithTarget.fs (1,0--1,37) }],
-              /root/RangeOfAttributeWithTarget.fs (1,0--1,37));
+                     Range = /root/RangeOfAttributeWithTarget.fs (2,2--2,35) }]
+                 Range = /root/RangeOfAttributeWithTarget.fs (2,0--2,37) }],
+              /root/RangeOfAttributeWithTarget.fs (2,0--2,37));
            Expr
              (Do
-                (Const (Unit, /root/RangeOfAttributeWithTarget.fs (2,3--2,5)),
-                 /root/RangeOfAttributeWithTarget.fs (2,0--2,5)),
-              /root/RangeOfAttributeWithTarget.fs (2,0--2,5))], PreXmlDocEmpty,
-          [], None, /root/RangeOfAttributeWithTarget.fs (1,0--2,5),
+                (Const (Unit, /root/RangeOfAttributeWithTarget.fs (3,3--3,5)),
+                 /root/RangeOfAttributeWithTarget.fs (3,0--3,5)),
+              /root/RangeOfAttributeWithTarget.fs (3,0--3,5))], PreXmlDocEmpty,
+          [], None, /root/RangeOfAttributeWithTarget.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs
index 31251e9126c..a5696624543 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs
+++ b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs
@@ -1,3 +1,4 @@
+
 [<NoEquality ; NoComparison>]
 type Foo<'context, 'a> =
     | Apply of ApplyCrate<'context, 'a>
@@ -6,4 +7,4 @@ and [<CustomEquality ; NoComparison>] Bar<'context, 'a> =
     internal {
         Hash : int
         Foo : Foo<'a, 'b>
-    }
\ No newline at end of file
+    }
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
index 8f84f2cd436..e2a92be6e04 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
@@ -13,31 +13,31 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,2--1,12))
+                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,2--2,12))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,2--1,12) };
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,2--2,12) };
                           { TypeName = SynLongIdent ([NoComparison], [], [None])
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,15--1,27))
+                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,15--2,27))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,15--1,27) }]
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,15--2,27) }]
                         Range =
-                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,0--1,29) }],
+                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--2,29) }],
                      Some
                        (PostfixList
                           ([SynTyparDecl ([], SynTypar (context, None, false));
                             SynTyparDecl ([], SynTypar (a, None, false))], [],
-                           /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,8--2,22))),
+                           /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,8--3,22))),
                      [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      true, None,
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,5--2,8)),
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,5--3,8)),
                   Simple
                     (Union
                        (None,
@@ -50,39 +50,39 @@ ImplFile
                                     (LongIdent
                                        (SynLongIdent ([ApplyCrate], [], [None])),
                                      Some
-                                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,25--3,26),
+                                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,25--4,26),
                                      [Var
                                         (SynTypar (context, None, false),
-                                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,26--3,34));
+                                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,26--4,34));
                                       Var
                                         (SynTypar (a, None, false),
-                                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,36--3,38))],
-                                     [/root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,34--3,35)],
+                                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,36--4,38))],
+                                     [/root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,34--4,35)],
                                      Some
-                                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,38--3,39),
+                                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,38--4,39),
                                      false,
-                                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,15--3,39)),
+                                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,15--4,39)),
                                   false,
-                                  PreXmlDoc ((3,15), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((4,15), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,15--3,39),
+                                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,15--4,39),
                                   { LeadingKeyword = None })],
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,6--3,39),
+                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,6--4,39),
                             { BarRange =
                                Some
-                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,4--3,5) })],
-                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,4--3,39)),
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,4--3,39)),
+                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,4--4,5) })],
+                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,4--4,39)),
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,4--4,39)),
                   [], None,
-                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,0--3,39),
+                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--4,39),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--2,4)
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,0--3,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,23--2,24)
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,23--3,24)
                     WithKeyword = None });
                SynTypeDefn
                  (SynComponentInfo
@@ -92,79 +92,79 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,6--5,20))
+                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,6--6,20))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,6--5,20) };
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,6--6,20) };
                           { TypeName = SynLongIdent ([NoComparison], [], [None])
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,23--5,35))
+                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,23--6,35))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,23--5,35) }]
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,23--6,35) }]
                         Range =
-                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,4--5,37) }],
+                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,4--6,37) }],
                      Some
                        (PostfixList
                           ([SynTyparDecl ([], SynTypar (context, None, false));
                             SynTyparDecl ([], SynTypar (a, None, false))], [],
-                           /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,41--5,55))),
+                           /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,41--6,55))),
                      [], [Bar],
-                     PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                      true, None,
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,38--5,41)),
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,38--6,41)),
                   Simple
                     (Record
                        (Some
                           (Internal
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,4--6,12)),
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (7,4--7,12)),
                         [SynField
                            ([], false, Some Hash,
                             LongIdent (SynLongIdent ([int], [], [None])), false,
-                            PreXmlDoc ((7,8), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((8,8), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (7,8--7,18),
+                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,8--8,18),
                             { LeadingKeyword = None });
                          SynField
                            ([], false, Some Foo,
                             App
                               (LongIdent (SynLongIdent ([Foo], [], [None])),
                                Some
-                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,17--8,18),
+                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,17--9,18),
                                [Var
                                   (SynTypar (a, None, false),
-                                   /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,18--8,20));
+                                   /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,18--9,20));
                                 Var
                                   (SynTypar (b, None, false),
-                                   /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,22--8,24))],
-                               [/root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,20--8,21)],
+                                   /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,22--9,24))],
+                               [/root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,20--9,21)],
                                Some
-                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,24--8,25),
+                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,24--9,25),
                                false,
-                               /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,14--8,25)),
+                               /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,14--9,25)),
                             false,
-                            PreXmlDoc ((8,8), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((9,8), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,8--8,25),
+                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,8--9,25),
                             { LeadingKeyword = None })],
-                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,4--9,5)),
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,4--9,5)),
+                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (7,4--10,5)),
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (7,4--10,5)),
                   [], None,
-                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,4--9,5),
+                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,4--10,5),
                   { LeadingKeyword =
                      And
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,0--5,3)
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,0--6,3)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (5,56--5,57)
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,56--6,57)
                     WithKeyword = None })],
-              /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,0--9,5))],
+              /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--10,5))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (1,0--9,5),
+          /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--11,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi
index c53b09a6726..cbcdfe43a48 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi
+++ b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi
@@ -1,3 +1,4 @@
+
 namespace SomeNamespace
 
 type Foo =
@@ -8,4 +9,4 @@ and [<CustomEquality>] Bang =
         {
             LongNameBarBarBarBarBarBarBar: int
         }
-        override GetHashCode : unit -> int
\ No newline at end of file
+        override GetHashCode : unit -> int
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
index ba55ad5882a..02f1465f598 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
@@ -9,30 +9,30 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (3,5--3,8)),
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,5--4,8)),
                   Simple
                     (Union
                        (None,
                         [SynUnionCase
                            ([], SynIdent (Bar, None), Fields [],
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,6--4,9),
+                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (5,6--5,9),
                             { BarRange =
                                Some
-                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,4--4,5) })],
-                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,4--4,9)),
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,4--4,9)),
+                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (5,4--5,5) })],
+                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (5,4--5,9)),
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (5,4--5,9)),
                   [],
-                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (3,5--4,9),
+                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,5--5,9),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (3,0--3,4)
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (3,9--3,10)
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,9--4,10)
                     WithKeyword = None });
                SynTypeDefnSig
                  (SynComponentInfo
@@ -42,31 +42,31 @@ SigFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,6--6,20))
+                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,6--7,20))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,6--6,20) }]
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,6--7,20) }]
                         Range =
-                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,4--6,22) }],
+                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,4--7,22) }],
                      None, [], [Bang],
-                     PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((7,4), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,23--6,27)),
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,23--7,27)),
                   Simple
                     (Record
                        (Some
                           (Internal
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,4--7,12)),
+                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (8,4--8,12)),
                         [SynField
                            ([], false, Some LongNameBarBarBarBarBarBarBar,
                             LongIdent (SynLongIdent ([int], [], [None])), false,
-                            PreXmlDoc ((9,12), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((10,12), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (9,12--9,46),
+                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (10,12--10,46),
                             { LeadingKeyword = None })],
-                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,4--10,9)),
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,4--10,9)),
+                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (8,4--11,9)),
+                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (8,4--11,9)),
                   [Member
                      (SynValSig
                         ([], SynIdent (GetHashCode, None),
@@ -74,18 +74,18 @@ SigFile
                          Fun
                            (LongIdent (SynLongIdent ([unit], [], [None])),
                             LongIdent (SynLongIdent ([int], [], [None])),
-                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (11,31--11,42),
+                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,31--12,42),
                             { ArrowRange =
-                               /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (11,36--11,38) }),
+                               /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,36--12,38) }),
                          SynValInfo
                            ([[SynArgInfo ([], false, None)]],
                             SynArgInfo ([], false, None)), false, false,
-                         PreXmlDoc ((11,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((12,8), FSharp.Compiler.Xml.XmlDocCollector),
                          None, None,
-                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (11,8--11,42),
+                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,8--12,42),
                          { LeadingKeyword =
                             Override
-                              /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (11,8--11,16)
+                              /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,8--12,16)
                            InlineKeyword = None
                            WithKeyword = None
                            EqualsRange = None }),
@@ -95,21 +95,21 @@ SigFile
                         IsFinal = false
                         GetterOrSetterIsCompilerGenerated = false
                         MemberKind = Member },
-                      /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (11,8--11,42),
+                      /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,8--12,42),
                       { GetSetKeywords = None })],
-                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,4--11,42),
+                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,4--12,42),
                   { LeadingKeyword =
                      And
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,0--6,3)
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,0--7,3)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (6,28--6,29)
+                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,28--7,29)
                     WithKeyword = None })],
-              /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (3,0--11,42))],
+              /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,0--12,42))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (1,0--11,42),
+          /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (2,0--12,42),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (1,0--1,9) })],
+               /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs b/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs
index 34b2a1e3112..7c4972e19ba 100644
--- a/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs
+++ b/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs
@@ -1,7 +1,8 @@
+
 try
     foo ()
 with
 | IOException as ioex ->
     // some comment
     ()
-| ex -> ()
\ No newline at end of file
+| ex -> ()
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
index 471c28975b9..29908865120 100644
--- a/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
@@ -12,65 +12,65 @@ ImplFile
                    (NonAtomic, false, Ident foo,
                     Const
                       (Unit,
-                       /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,8--2,10)),
-                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,4--2,10)),
+                       /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (3,8--3,10)),
+                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (3,4--3,10)),
                  [SynMatchClause
                     (As
                        (LongIdent
                           (SynLongIdent ([IOException], [], [None]), None, None,
                            Pats [], None,
-                           /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,2--4,13)),
+                           /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,2--5,13)),
                         Named
                           (SynIdent (ioex, None), false, None,
-                           /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,17--4,21)),
-                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,2--4,21)),
+                           /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,17--5,21)),
+                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,2--5,21)),
                      None,
                      Const
                        (Unit,
-                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (6,4--6,6)),
-                     /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,2--6,6),
+                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (7,4--7,6)),
+                     /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,2--7,6),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,22--4,24)
+                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,22--5,24)
                        BarRange =
                         Some
-                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,0--4,1) });
+                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,0--5,1) });
                   SynMatchClause
                     (Named
                        (SynIdent (ex, None), false, None,
-                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (7,2--7,4)),
+                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,2--8,4)),
                      None,
                      Const
                        (Unit,
-                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (7,8--7,10)),
-                     /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (7,2--7,10),
+                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,8--8,10)),
+                     /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,2--8,10),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (7,5--7,7)
+                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,5--8,7)
                        BarRange =
                         Some
-                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (7,0--7,1) })],
-                 /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (1,0--7,10),
+                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,0--8,1) })],
+                 /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--8,10),
                  Yes
-                   /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (1,0--1,3),
+                   /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--2,3),
                  Yes
-                   /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (3,0--3,4),
+                   /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,0--4,4),
                  { TryKeyword =
-                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (1,0--1,3)
+                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--2,3)
                    TryToWithRange =
-                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (1,0--3,4)
+                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--4,4)
                    WithKeyword =
-                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (3,0--3,4)
+                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,0--4,4)
                    WithToEndRange =
-                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (3,0--7,10) }),
-              /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (1,0--7,10))],
+                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,0--8,10) }),
+              /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--8,10))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (1,0--7,10),
+          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--9,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,4--5,19)] },
+            /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (6,4--6,19)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs
index cf99189fafb..85ef7900a4b 100644
--- a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs
+++ b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs
@@ -1,2 +1,3 @@
+
 match foo with
-| Bar bar when (someCheck bar) -> ()
\ No newline at end of file
+| Bar bar when (someCheck bar) -> ()
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
index 7ccbae4ed8a..9bab0301378 100644
--- a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
           [Expr
              (Match
                 (Yes
-                   /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (1,0--1,14),
+                   /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--2,14),
                  Ident foo,
                  [SynMatchClause
                     (LongIdent
@@ -16,37 +16,37 @@ ImplFile
                         Pats
                           [Named
                              (SynIdent (bar, None), false, None,
-                              /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,6--2,9))],
+                              /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,6--3,9))],
                         None,
-                        /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,2--2,9)),
+                        /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,2--3,9)),
                      Some
                        (Paren
                           (App
                              (NonAtomic, false, Ident someCheck, Ident bar,
-                              /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,16--2,29)),
-                           /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,15--2,16),
+                              /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,16--3,29)),
+                           /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,15--3,16),
                            Some
-                             /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,29--2,30),
-                           /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,15--2,30))),
+                             /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,29--3,30),
+                           /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,15--3,30))),
                      Const
                        (Unit,
-                        /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,34--2,36)),
-                     /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,2--2,36),
+                        /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,34--3,36)),
+                     /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,2--3,36),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,31--2,33)
+                          /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,31--3,33)
                        BarRange =
                         Some
-                          /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--2,1) })],
-                 /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (1,0--2,36),
+                          /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,0--3,1) })],
+                 /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--3,36),
                  { MatchKeyword =
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (1,0--1,5)
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--2,5)
                    WithKeyword =
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (1,10--1,14) }),
-              /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (1,0--2,36))],
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,10--2,14) }),
+              /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--3,36))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (1,0--2,36),
+          /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
index 8fe9ac27d43..b61fcc84b59 100644
--- a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
+++ b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
@@ -1,4 +1,5 @@
+
 try
     foo ()
 with
-| exn -> ()
\ No newline at end of file
+| exn -> ()
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
index 2f1c247f6dd..695960269ca 100644
--- a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
@@ -11,40 +11,40 @@ ImplFile
                    (NonAtomic, false, Ident foo,
                     Const
                       (Unit,
-                       /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,8--2,10)),
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,4--2,10)),
+                       /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,8--3,10)),
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,4--3,10)),
                  [SynMatchClause
                     (Named
                        (SynIdent (exn, None), false, None,
-                        /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,2--4,5)),
+                        /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,2--5,5)),
                      None,
                      Const
                        (Unit,
-                        /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,9--4,11)),
-                     /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,2--4,11),
+                        /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,9--5,11)),
+                     /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,2--5,11),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,6--4,8)
+                          /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,6--5,8)
                        BarRange =
                         Some
-                          /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,1) })],
-                 /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--4,11),
+                          /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,0--5,1) })],
+                 /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--5,11),
                  Yes
-                   /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--1,3),
+                   /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--2,3),
                  Yes
-                   /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,0--3,4),
+                   /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,4),
                  { TryKeyword =
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--1,3)
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--2,3)
                    TryToWithRange =
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--3,4)
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--4,4)
                    WithKeyword =
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,0--3,4)
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,4)
                    WithToEndRange =
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,0--4,11) }),
-              /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--4,11))],
+                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--5,11) }),
+              /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--5,11))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (1,0--4,11),
+          /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs b/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs
index 66757d1e40d..2cd8716c9a5 100644
--- a/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs
+++ b/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs
@@ -1,3 +1,4 @@
+
 match foo with
 | Bar bar when (someCheck bar) -> ()
-| Far too -> near ()
\ No newline at end of file
+| Far too -> near ()
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
index 1478043fec1..f325809a653 100644
--- a/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
           [Expr
              (Match
                 (Yes
-                   /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (1,0--1,14),
+                   /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--2,14),
                  Ident foo,
                  [SynMatchClause
                     (LongIdent
@@ -16,61 +16,61 @@ ImplFile
                         Pats
                           [Named
                              (SynIdent (bar, None), false, None,
-                              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,6--2,9))],
+                              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,6--3,9))],
                         None,
-                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,2--2,9)),
+                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,2--3,9)),
                      Some
                        (Paren
                           (App
                              (NonAtomic, false, Ident someCheck, Ident bar,
-                              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,16--2,29)),
-                           /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,15--2,16),
+                              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,16--3,29)),
+                           /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,15--3,16),
                            Some
-                             /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,29--2,30),
-                           /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,15--2,30))),
+                             /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,29--3,30),
+                           /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,15--3,30))),
                      Const
                        (Unit,
-                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,34--2,36)),
-                     /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,2--2,36),
+                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,34--3,36)),
+                     /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,2--3,36),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,31--2,33)
+                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,31--3,33)
                        BarRange =
                         Some
-                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--2,1) });
+                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,0--3,1) });
                   SynMatchClause
                     (LongIdent
                        (SynLongIdent ([Far], [], [None]), None, None,
                         Pats
                           [Named
                              (SynIdent (too, None), false, None,
-                              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,6--3,9))],
+                              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,6--4,9))],
                         None,
-                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,2--3,9)),
+                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,2--4,9)),
                      None,
                      App
                        (NonAtomic, false, Ident near,
                         Const
                           (Unit,
-                           /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,18--3,20)),
-                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,13--3,20)),
-                     /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,2--3,20),
+                           /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,18--4,20)),
+                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,13--4,20)),
+                     /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,2--4,20),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,10--3,12)
+                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,10--4,12)
                        BarRange =
                         Some
-                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,0--3,1) })],
-                 /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (1,0--3,20),
+                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,0--4,1) })],
+                 /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--4,20),
                  { MatchKeyword =
-                    /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (1,0--1,5)
+                    /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--2,5)
                    WithKeyword =
-                    /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (1,10--1,14) }),
-              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (1,0--3,20))],
+                    /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,10--2,14) }),
+              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--4,20))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (1,0--3,20),
+          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi
index 6df4f86fa6a..d5e89bc4139 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi
@@ -1,4 +1,5 @@
+
 namespace Foo
 
 module X =
-val bar : int
\ No newline at end of file
+val bar : int
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi.bsl
index 20700156fce..9aee253eafc 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi.bsl
@@ -7,36 +7,36 @@ SigFile
           [NestedModule
              (SynComponentInfo
                 ([], None, [], [X],
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (3,0--3,8)),
+                 /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,0--4,8)),
               false,
               [Val
                  (SynValSig
                     ([], SynIdent (bar, None), SynValTyparDecls (None, true),
                      LongIdent (SynLongIdent ([int], [], [None])),
                      SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                      None, None,
-                     /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,0--4,13),
+                     /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (5,0--5,13),
                      { LeadingKeyword =
                         Val
-                          /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,0--4,3)
+                          /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (5,0--5,3)
                        InlineKeyword = None
                        WithKeyword = None
                        EqualsRange = None }),
-                  /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,0--4,13))],
-              /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (3,0--4,13),
+                  /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (5,0--5,13))],
+              /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,0--5,13),
               { ModuleKeyword =
                  Some
-                   /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (3,0--3,6)
+                   /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,0--4,6)
                 EqualsRange =
                  Some
-                   /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (3,9--3,10) })],
+                   /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,9--4,10) })],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (1,0--4,13),
+          /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (2,0--5,13),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (1,0--1,9) })],
+               /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs
index aff77d7dc43..f9e045c9eb7 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs
@@ -1,2 +1,3 @@
+
 module X =
-()
\ No newline at end of file
+()
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs.bsl
index d8d364f1492..abf8296c9f3 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs.bsl
@@ -7,20 +7,20 @@ ImplFile
           [NestedModule
              (SynComponentInfo
                 ([], None, [], [X],
-                 PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), false,
-                 None, /root/RangeOfEqualSignShouldBePresent.fs (1,0--1,8)),
+                 PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 None, /root/RangeOfEqualSignShouldBePresent.fs (2,0--2,8)),
               false,
               [Expr
                  (Const
-                    (Unit, /root/RangeOfEqualSignShouldBePresent.fs (2,0--2,2)),
-                  /root/RangeOfEqualSignShouldBePresent.fs (2,0--2,2))], false,
-              /root/RangeOfEqualSignShouldBePresent.fs (1,0--2,2),
+                    (Unit, /root/RangeOfEqualSignShouldBePresent.fs (3,0--3,2)),
+                  /root/RangeOfEqualSignShouldBePresent.fs (3,0--3,2))], false,
+              /root/RangeOfEqualSignShouldBePresent.fs (2,0--3,2),
               { ModuleKeyword =
-                 Some /root/RangeOfEqualSignShouldBePresent.fs (1,0--1,6)
+                 Some /root/RangeOfEqualSignShouldBePresent.fs (2,0--2,6)
                 EqualsRange =
-                 Some /root/RangeOfEqualSignShouldBePresent.fs (1,9--1,10) })],
+                 Some /root/RangeOfEqualSignShouldBePresent.fs (2,9--2,10) })],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresent.fs (1,0--2,2),
+          /root/RangeOfEqualSignShouldBePresent.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs
index d9203654144..3b8dd837945 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs
@@ -1,3 +1,4 @@
+
 do
     let z: int = 2
-    ()
\ No newline at end of file
+    ()
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs.bsl
index 4f3c53fec8f..15b59c3def6 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs.bsl
@@ -12,46 +12,46 @@ ImplFile
                    (false, false,
                     [SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
                            None),
                         Named
                           (SynIdent (z, None), false, None,
-                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,8--2,9)),
+                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,8--3,9)),
                         Some
                           (SynBindingReturnInfo
                              (LongIdent (SynLongIdent ([int], [], [None])),
-                              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,11--2,14),
+                              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,11--3,14),
                               [],
                               { ColonRange =
                                  Some
-                                   /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,9--2,10) })),
+                                   /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,9--3,10) })),
                         Typed
                           (Const
                              (Int32 2,
-                              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,17--2,18)),
+                              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,17--3,18)),
                            LongIdent (SynLongIdent ([int], [], [None])),
-                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,17--2,18)),
-                        /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,8--2,9),
+                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,17--3,18)),
+                        /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,8--3,9),
                         Yes
-                          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,4--2,18),
+                          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,4--3,18),
                         { LeadingKeyword =
                            Let
-                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,4--2,7)
+                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,4--3,7)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,15--2,16) })],
+                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,15--3,16) })],
                     Const
                       (Unit,
-                       /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,4--3,6)),
-                    /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,4--3,6),
+                       /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (4,4--4,6)),
+                    /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,4--4,6),
                     { InKeyword = None }),
-                 /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (1,0--3,6)),
-              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (1,0--3,6))],
+                 /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,0--4,6)),
+              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,0--4,6))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (1,0--3,6),
+          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs
index 32bda4dd3e5..837747f54c0 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs
@@ -1,3 +1,4 @@
+
 do
     let z = 2
-    ()
\ No newline at end of file
+    ()
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
index 68fc962d362..cad92a0ca80 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
@@ -11,36 +11,36 @@ ImplFile
                    (false, false,
                     [SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
                            None),
                         Named
                           (SynIdent (z, None), false, None,
-                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,8--2,9)),
+                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,8--3,9)),
                         None,
                         Const
                           (Int32 2,
-                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,12--2,13)),
-                        /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,8--2,9),
+                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,12--3,13)),
+                        /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,8--3,9),
                         Yes
-                          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,4--2,13),
+                          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,4--3,13),
                         { LeadingKeyword =
                            Let
-                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,4--2,7)
+                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,4--3,7)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,10--2,11) })],
+                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,10--3,11) })],
                     Const
                       (Unit,
-                       /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,4--3,6)),
-                    /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,4--3,6),
+                       /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (4,4--4,6)),
+                    /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,4--4,6),
                     { InKeyword = None }),
-                 /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (1,0--3,6)),
-              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (1,0--3,6))],
+                 /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,0--4,6)),
+              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,0--4,6))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (1,0--3,6),
+          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs
index 3242dd958ae..17bba88203a 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs
@@ -1,2 +1,3 @@
+
 type X() =
-    member this.Y () = z
\ No newline at end of file
+    member this.Y () = z
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs.bsl
index ef2baea4bc4..5b0672aa10c 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs.bsl
@@ -11,24 +11,24 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,5--1,6)),
+                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,6--1,8)),
+                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,6--2,8)),
                          None,
-                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,5--1,6),
+                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,5--2,6),
                          { AsKeyword = None });
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -42,50 +42,50 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; Y],
-                                  [/root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,15--2,16)],
+                                  [/root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,15--3,16)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,18--2,20)),
-                                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,18--2,20))],
+                                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,18--3,20)),
+                                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,18--3,20))],
                                None,
-                               /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,11--2,20)),
+                               /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,11--3,20)),
                             None, Ident z,
-                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,11--2,20),
+                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,11--3,20),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,4--2,10)
+                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,4--3,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,21--2,22) }),
-                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,4--2,24))],
-                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,4--2,24)),
+                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,21--3,22) }),
+                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,4--3,24))],
+                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,4--3,24)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,6--1,8)),
+                           /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,6--2,8)),
                         None,
-                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,5--1,6),
+                        PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,5--2,24),
+                  /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,5--3,24),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,0--1,4)
+                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,9--1,10)
+                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,0--2,24))],
+              /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,0--3,24))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (1,0--2,24),
+          /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs
index 83afc7e1c5f..2dddd2d4a12 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs
@@ -1,2 +1,3 @@
+
 type X() =
-    member this.Y () : string = z
\ No newline at end of file
+    member this.Y () : string = z
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs.bsl
index f586e0ea84a..6bd77e4926d 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs.bsl
@@ -11,24 +11,24 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,5--1,6)),
+                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,6--1,8)),
+                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,6--2,8)),
                          None,
-                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,5--1,6),
+                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,5--2,6),
                          { AsKeyword = None });
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -42,62 +42,62 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; Y],
-                                  [/root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,15--2,16)],
+                                  [/root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,15--3,16)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,18--2,20)),
-                                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,18--2,20))],
+                                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,18--3,20)),
+                                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,18--3,20))],
                                None,
-                               /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,11--2,20)),
+                               /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,11--3,20)),
                             Some
                               (SynBindingReturnInfo
                                  (LongIdent
                                     (SynLongIdent ([string], [], [None])),
-                                  /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,23--2,29),
+                                  /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,23--3,29),
                                   [],
                                   { ColonRange =
                                      Some
-                                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,21--2,22) })),
+                                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,21--3,22) })),
                             Typed
                               (Ident z,
                                LongIdent (SynLongIdent ([string], [], [None])),
-                               /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,32--2,33)),
-                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,11--2,20),
+                               /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,32--3,33)),
+                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,11--3,20),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,4--2,10)
+                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,4--3,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,30--2,31) }),
-                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,4--2,33))],
-                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,4--2,33)),
+                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,30--3,31) }),
+                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,4--3,33))],
+                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,4--3,33)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,6--1,8)),
+                           /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,6--2,8)),
                         None,
-                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,5--1,6),
+                        PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,5--2,33),
+                  /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,5--3,33),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,0--1,4)
+                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,9--1,10)
+                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,0--2,33))],
+              /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,0--3,33))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (1,0--2,33),
+          /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs
index 979c0591f61..c6d9c601d15 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs
@@ -1,2 +1,3 @@
+
 type X() =
-    member this.Y = z
\ No newline at end of file
+    member this.Y = z
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
index 6a0554e6fb5..ef122d7f88e 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
@@ -8,24 +8,24 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,5--1,6)),
+                     /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,6--1,8)),
+                            /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,6--2,8)),
                          None,
-                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,5--1,6),
+                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,5--2,6),
                          { AsKeyword = None });
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -39,43 +39,43 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; Y],
-                                  [/root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,15--2,16)],
+                                  [/root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,15--3,16)],
                                   [None; None]), None, None, Pats [], None,
-                               /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,11--2,17)),
+                               /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,11--3,17)),
                             None, Ident z,
-                            /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,11--2,17),
+                            /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,11--3,17),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,4--2,10)
+                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,4--3,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,18--2,19) }),
-                         /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,4--2,21))],
-                     /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,4--2,21)),
+                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,18--3,19) }),
+                         /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,4--3,21))],
+                     /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,4--3,21)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,6--1,8)),
+                           /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,6--2,8)),
                         None,
-                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,5--1,6),
+                        PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,5--2,21),
+                  /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,5--3,21),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,0--1,4)
+                       /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,9--1,10)
+                       /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,0--2,21))],
+              /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,0--3,21))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (1,0--2,21),
+          /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs
index cb2f1df6c7d..9ee450cc2c3 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs
@@ -1,4 +1,5 @@
+
 type Y() =
     member this.MyReadWriteProperty
         with get () = myInternalValue
-        and set (value) = myInternalValue <- value
\ No newline at end of file
+        and set (value) = myInternalValue <- value
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
index 86ef322b252..a479e7696d4 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
@@ -8,26 +8,26 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Y],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,5--1,6)),
+                     /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,6--1,8)),
+                            /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,6--2,8)),
                          None,
-                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,5--1,6),
+                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,5--2,6),
                          { AsKeyword = None });
                       GetSetMember
                         (Some
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -42,31 +42,31 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadWriteProperty],
-                                     [/root/RangeOfEqualSignShouldBePresentInProperty.fs (2,15--2,16)],
+                                     [/root/RangeOfEqualSignShouldBePresentInProperty.fs (3,15--3,16)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,17--3,19)),
-                                        /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,17--3,19))],
+                                           /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,17--4,19)),
+                                        /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,17--4,19))],
                                   None,
-                                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,13--3,19)),
+                                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,13--4,19)),
                                None, Ident myInternalValue,
-                               /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,13--3,19),
+                               /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,13--4,19),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,4--2,10)
+                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,4--3,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,20--3,21) })),
+                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,20--4,21) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -82,66 +82,66 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadWriteProperty],
-                                     [/root/RangeOfEqualSignShouldBePresentInProperty.fs (2,15--2,16)],
+                                     [/root/RangeOfEqualSignShouldBePresentInProperty.fs (3,15--3,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Named
                                           (SynIdent (value, None), false, None,
-                                           /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,17--4,22)),
-                                        /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,16--4,23))],
+                                           /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,17--5,22)),
+                                        /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,16--5,23))],
                                   None,
-                                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,12--4,23)),
+                                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,12--5,23)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([myInternalValue], [], [None]),
                                   Ident value,
-                                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,26--4,50)),
-                               /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,12--4,23),
+                                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,26--5,50)),
+                               /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,12--5,23),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,4--2,10)
+                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,4--3,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,24--4,25) })),
-                         /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,4--4,50),
+                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,24--5,25) })),
+                         /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,4--5,50),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,8--3,12)
+                            /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,8--4,12)
                            GetKeyword =
                             Some
-                              /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,13--3,16)
+                              /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,13--4,16)
                            AndKeyword =
                             Some
-                              /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,8--4,11)
+                              /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,8--5,11)
                            SetKeyword =
                             Some
-                              /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,12--4,15) })],
-                     /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,4--4,50)),
+                              /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,12--5,15) })],
+                     /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,4--5,50)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,6--1,8)),
+                           /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,6--2,8)),
                         None,
-                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,5--1,6),
+                        PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,5--4,50),
+                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,5--5,50),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,0--1,4)
+                       /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,9--1,10)
+                       /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,0--4,50))],
+              /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,0--5,50))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInProperty.fs (1,0--4,50),
+          /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs
index 395f9bfe3d8..0f8e89ab06e 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs
@@ -1 +1,2 @@
-let v : int = 12
\ No newline at end of file
+
+let v : int = 12
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs.bsl
index 9d88e58ef25..2dff3db7292 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs.bsl
@@ -11,39 +11,39 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (v, None), false, None,
-                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,4--1,5)),
+                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,4--2,5)),
                   Some
                     (SynBindingReturnInfo
                        (LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,8--1,11),
+                        /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,8--2,11),
                         [],
                         { ColonRange =
                            Some
-                             /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,6--1,7) })),
+                             /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,6--2,7) })),
                   Typed
                     (Const
                        (Int32 12,
-                        /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,14--1,16)),
+                        /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,14--2,16)),
                      LongIdent (SynLongIdent ([int], [], [None])),
-                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,14--1,16)),
-                  /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,4--1,5),
+                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,14--2,16)),
+                  /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,4--2,5),
                   Yes
-                    /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,0--1,16),
+                    /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,0--2,16),
                   { LeadingKeyword =
                      Let
-                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,0--1,3)
+                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,12--1,13) })],
-              /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,0--1,16))],
+                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,12--2,13) })],
+              /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,0--2,16))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (1,0--1,16),
+          /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs
index ddcb0df4840..e7137ff04ca 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs
@@ -1 +1,2 @@
-let v = 12
\ No newline at end of file
+
+let v = 12
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
index 8b89774e90a..38d18ddc144 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
@@ -10,29 +10,29 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (v, None), false, None,
-                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,4--1,5)),
+                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,4--2,5)),
                   None,
                   Const
                     (Int32 12,
-                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,8--1,10)),
-                  /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,4--1,5),
+                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,8--2,10)),
+                  /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,4--2,5),
                   Yes
-                    /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,10),
+                    /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,10),
                   { LeadingKeyword =
                      Let
-                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,3)
+                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,6--1,7) })],
-              /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,10))],
+                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,6--2,7) })],
+              /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,10))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,10),
+          /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs
index 3b53cd640c1..219eed0b8fd 100644
--- a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs
+++ b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs
@@ -1,3 +1,4 @@
+
 let a =
     let b c = d
-    ()
\ No newline at end of file
+    ()
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
index e0d8a512214..ef5b5feedf5 100644
--- a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
@@ -10,18 +10,18 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (a, None), false, None,
-                     /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (1,4--1,5)),
+                     /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,4--2,5)),
                   None,
                   LetOrUse
                     (false, false,
                      [SynBinding
                         (None, Normal, false, false, [],
-                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          SynValData
                            (None,
                             SynValInfo
@@ -32,36 +32,36 @@ ImplFile
                             Pats
                               [Named
                                  (SynIdent (c, None), false, None,
-                                  /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,10--2,11))],
+                                  /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,10--3,11))],
                             None,
-                            /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,8--2,11)),
+                            /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,8--3,11)),
                          None, Ident d,
-                         /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,8--2,11),
+                         /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,8--3,11),
                          NoneAtLet,
                          { LeadingKeyword =
                             Let
-                              /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,4--2,7)
+                              /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,4--3,7)
                            InlineKeyword = None
                            EqualsRange =
                             Some
-                              /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,12--2,13) })],
+                              /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,12--3,13) })],
                      Const
                        (Unit,
-                        /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,4--3,6)),
-                     /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,4--3,6),
+                        /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (4,4--4,6)),
+                     /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,4--4,6),
                      { InKeyword = None }),
-                  /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (1,4--1,5),
+                  /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,4--2,5),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (1,0--1,3)
+                       /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (1,6--1,7) })],
-              /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (1,0--3,6))],
+                       /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,6--2,7) })],
+              /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,0--4,6))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (1,0--3,6),
+          /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs
index ddcb0df4840..e7137ff04ca 100644
--- a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs
+++ b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs
@@ -1 +1,2 @@
-let v = 12
\ No newline at end of file
+
+let v = 12
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
index 5c485af2ea3..27bf7206361 100644
--- a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
@@ -11,29 +11,29 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (v, None), false, None,
-                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,4--1,5)),
+                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,4--2,5)),
                   None,
                   Const
                     (Int32 12,
-                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,8--1,10)),
-                  /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,4--1,5),
+                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,8--2,10)),
+                  /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,4--2,5),
                   Yes
-                    /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,10),
+                    /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,10),
                   { LeadingKeyword =
                      Let
-                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,3)
+                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,6--1,7) })],
-              /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,10))],
+                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,6--2,7) })],
+              /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,10))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (1,0--1,10),
+          /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs
index fa422a5ee06..8b920c819d6 100644
--- a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs
+++ b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs
@@ -1,4 +1,5 @@
+
 /// XmlDoc
 [<SomeAttribute>]
 // some comment
-let v = 12
\ No newline at end of file
+let v = 12
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
index a8abd6f450e..2b231eebdd9 100644
--- a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
@@ -17,39 +17,39 @@ ImplFile
                          ArgExpr =
                           Const
                             (Unit,
-                             /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,2--2,15))
+                             /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,2--3,15))
                          Target = None
                          AppliesToGetterAndSetter = false
                          Range =
-                          /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,2--2,15) }]
+                          /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,2--3,15) }]
                      Range =
-                      /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,0--2,17) }],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                      /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,0--3,17) }],
+                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (v, None), false, None,
-                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (4,4--4,5)),
+                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (5,4--5,5)),
                   None,
                   Const
                     (Int32 12,
-                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (4,8--4,10)),
-                  /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (1,0--4,5),
+                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (5,8--5,10)),
+                  /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,0--5,5),
                   Yes
-                    /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,0--4,10),
+                    /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,0--5,10),
                   { LeadingKeyword =
                      Let
-                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (4,0--4,3)
+                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (5,0--5,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (4,6--4,7) })],
-              /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (1,0--4,10))],
+                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (5,6--5,7) })],
+              /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,0--5,10))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,0--4,10),
+          /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,0--3,15)] },
+            /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (4,0--4,15)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi b/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi
index b3cab2b90b4..132531c296f 100644
--- a/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi
+++ b/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi
@@ -1,6 +1,7 @@
+
 module internal FSharp.Compiler.ParseHelpers
 
 exception SyntaxError of obj * range: range with
     member Meh : string -> int
 
-open Foo
\ No newline at end of file
+open Foo
diff --git a/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
index 7c6aca28d03..c918d26faf1 100644
--- a/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
@@ -14,42 +14,42 @@ SigFile
                          [SynField
                             ([], false, None,
                              LongIdent (SynLongIdent ([obj], [], [None])), false,
-                             PreXmlDoc ((3,25), FSharp.Compiler.Xml.XmlDocCollector),
+                             PreXmlDoc ((4,25), FSharp.Compiler.Xml.XmlDocCollector),
                              None,
-                             /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,25--3,28),
+                             /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,25--4,28),
                              { LeadingKeyword = None });
                           SynField
                             ([], false, Some range,
                              LongIdent (SynLongIdent ([range], [], [None])),
                              false,
-                             PreXmlDoc ((3,31), FSharp.Compiler.Xml.XmlDocCollector),
+                             PreXmlDoc ((4,31), FSharp.Compiler.Xml.XmlDocCollector),
                              None,
-                             /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,31--3,43),
+                             /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,31--4,43),
                              { LeadingKeyword = None })], PreXmlDocEmpty, None,
-                       /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,10--3,43),
+                       /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,10--4,43),
                        { BarRange = None }), None,
-                    PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                    /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,0--3,43)),
+                    PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                    /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,0--4,43)),
                  Some
-                   /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,44--3,48),
+                   /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,44--4,48),
                  [Member
                     (SynValSig
                        ([], SynIdent (Meh, None), SynValTyparDecls (None, true),
                         Fun
                           (LongIdent (SynLongIdent ([string], [], [None])),
                            LongIdent (SynLongIdent ([int], [], [None])),
-                           /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,17--4,30),
+                           /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,17--5,30),
                            { ArrowRange =
-                              /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,24--4,26) }),
+                              /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,24--5,26) }),
                         SynValInfo
                           ([[SynArgInfo ([], false, None)]],
                            SynArgInfo ([], false, None)), false, false,
-                        PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                         None, None,
-                        /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,4--4,30),
+                        /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,4--5,30),
                         { LeadingKeyword =
                            Member
-                             /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,4--4,10)
+                             /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,4--5,10)
                           InlineKeyword = None
                           WithKeyword = None
                           EqualsRange = None }),
@@ -59,22 +59,22 @@ SigFile
                        IsFinal = false
                        GetterOrSetterIsCompilerGenerated = false
                        MemberKind = Member },
-                     /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,4--4,30),
+                     /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,4--5,30),
                      { GetSetKeywords = None })],
-                 /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,0--4,30)),
-              /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (3,0--4,30));
+                 /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,0--5,30)),
+              /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,0--5,30));
            Open
              (ModuleOrNamespace
                 (SynLongIdent ([Foo], [], [None]),
-                 /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (6,5--6,8)),
-              /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (6,0--6,8))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [],
+                 /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (7,5--7,8)),
+              /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (7,0--7,8))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [],
           Some
             (Internal
-               /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (1,7--1,15)),
-          /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (1,0--6,8),
+               /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (2,7--2,15)),
+          /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (2,0--7,8),
           { LeadingKeyword =
              Module
-               /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (1,0--1,6) })],
+               /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs b/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs
index 60a37407ffa..f55c5019485 100644
--- a/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs
+++ b/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs
@@ -1,3 +1,4 @@
+
 try
     let content = tryDownloadFile url
     Some content
@@ -6,4 +7,4 @@ with
     Infrastructure.ReportWarning ex
     None
 | exx ->
-    None
\ No newline at end of file
+    None
diff --git a/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs.bsl
index baa057a8093..a8b3eb2ef2e 100644
--- a/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs.bsl
@@ -10,34 +10,34 @@ ImplFile
                    (false, false,
                     [SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
                            None),
                         Named
                           (SynIdent (content, None), false, None,
-                           /root/RangeOfMultipleSynMatchClause.fs (2,8--2,15)),
+                           /root/RangeOfMultipleSynMatchClause.fs (3,8--3,15)),
                         None,
                         App
                           (NonAtomic, false, Ident tryDownloadFile, Ident url,
-                           /root/RangeOfMultipleSynMatchClause.fs (2,18--2,37)),
-                        /root/RangeOfMultipleSynMatchClause.fs (2,8--2,15),
-                        Yes /root/RangeOfMultipleSynMatchClause.fs (2,4--2,37),
+                           /root/RangeOfMultipleSynMatchClause.fs (3,18--3,37)),
+                        /root/RangeOfMultipleSynMatchClause.fs (3,8--3,15),
+                        Yes /root/RangeOfMultipleSynMatchClause.fs (3,4--3,37),
                         { LeadingKeyword =
-                           Let /root/RangeOfMultipleSynMatchClause.fs (2,4--2,7)
+                           Let /root/RangeOfMultipleSynMatchClause.fs (3,4--3,7)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/RangeOfMultipleSynMatchClause.fs (2,16--2,17) })],
+                             /root/RangeOfMultipleSynMatchClause.fs (3,16--3,17) })],
                     App
                       (NonAtomic, false, Ident Some, Ident content,
-                       /root/RangeOfMultipleSynMatchClause.fs (3,4--3,16)),
-                    /root/RangeOfMultipleSynMatchClause.fs (2,4--3,16),
+                       /root/RangeOfMultipleSynMatchClause.fs (4,4--4,16)),
+                    /root/RangeOfMultipleSynMatchClause.fs (3,4--4,16),
                     { InKeyword = None }),
                  [SynMatchClause
                     (Named
                        (SynIdent (ex, None), false, None,
-                        /root/RangeOfMultipleSynMatchClause.fs (5,2--5,4)), None,
+                        /root/RangeOfMultipleSynMatchClause.fs (6,2--6,4)), None,
                      Sequential
                        (SuppressNeither, true,
                         App
@@ -46,42 +46,42 @@ ImplFile
                              (false,
                               SynLongIdent
                                 ([Infrastructure; ReportWarning],
-                                 [/root/RangeOfMultipleSynMatchClause.fs (6,18--6,19)],
+                                 [/root/RangeOfMultipleSynMatchClause.fs (7,18--7,19)],
                                  [None; None]), None,
-                              /root/RangeOfMultipleSynMatchClause.fs (6,4--6,32)),
+                              /root/RangeOfMultipleSynMatchClause.fs (7,4--7,32)),
                            Ident ex,
-                           /root/RangeOfMultipleSynMatchClause.fs (6,4--6,35)),
+                           /root/RangeOfMultipleSynMatchClause.fs (7,4--7,35)),
                         Ident None,
-                        /root/RangeOfMultipleSynMatchClause.fs (6,4--7,8)),
-                     /root/RangeOfMultipleSynMatchClause.fs (5,2--7,8), Yes,
+                        /root/RangeOfMultipleSynMatchClause.fs (7,4--8,8)),
+                     /root/RangeOfMultipleSynMatchClause.fs (6,2--8,8), Yes,
                      { ArrowRange =
-                        Some /root/RangeOfMultipleSynMatchClause.fs (5,5--5,7)
+                        Some /root/RangeOfMultipleSynMatchClause.fs (6,5--6,7)
                        BarRange =
-                        Some /root/RangeOfMultipleSynMatchClause.fs (5,0--5,1) });
+                        Some /root/RangeOfMultipleSynMatchClause.fs (6,0--6,1) });
                   SynMatchClause
                     (Named
                        (SynIdent (exx, None), false, None,
-                        /root/RangeOfMultipleSynMatchClause.fs (8,2--8,5)), None,
+                        /root/RangeOfMultipleSynMatchClause.fs (9,2--9,5)), None,
                      Ident None,
-                     /root/RangeOfMultipleSynMatchClause.fs (8,2--9,8), Yes,
+                     /root/RangeOfMultipleSynMatchClause.fs (9,2--10,8), Yes,
                      { ArrowRange =
-                        Some /root/RangeOfMultipleSynMatchClause.fs (8,6--8,8)
+                        Some /root/RangeOfMultipleSynMatchClause.fs (9,6--9,8)
                        BarRange =
-                        Some /root/RangeOfMultipleSynMatchClause.fs (8,0--8,1) })],
-                 /root/RangeOfMultipleSynMatchClause.fs (1,0--9,8),
-                 Yes /root/RangeOfMultipleSynMatchClause.fs (1,0--1,3),
-                 Yes /root/RangeOfMultipleSynMatchClause.fs (4,0--4,4),
+                        Some /root/RangeOfMultipleSynMatchClause.fs (9,0--9,1) })],
+                 /root/RangeOfMultipleSynMatchClause.fs (2,0--10,8),
+                 Yes /root/RangeOfMultipleSynMatchClause.fs (2,0--2,3),
+                 Yes /root/RangeOfMultipleSynMatchClause.fs (5,0--5,4),
                  { TryKeyword =
-                    /root/RangeOfMultipleSynMatchClause.fs (1,0--1,3)
+                    /root/RangeOfMultipleSynMatchClause.fs (2,0--2,3)
                    TryToWithRange =
-                    /root/RangeOfMultipleSynMatchClause.fs (1,0--4,4)
+                    /root/RangeOfMultipleSynMatchClause.fs (2,0--5,4)
                    WithKeyword =
-                    /root/RangeOfMultipleSynMatchClause.fs (4,0--4,4)
+                    /root/RangeOfMultipleSynMatchClause.fs (5,0--5,4)
                    WithToEndRange =
-                    /root/RangeOfMultipleSynMatchClause.fs (4,0--9,8) }),
-              /root/RangeOfMultipleSynMatchClause.fs (1,0--9,8))],
+                    /root/RangeOfMultipleSynMatchClause.fs (5,0--10,8) }),
+              /root/RangeOfMultipleSynMatchClause.fs (2,0--10,8))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfMultipleSynMatchClause.fs (1,0--9,8),
+          /root/RangeOfMultipleSynMatchClause.fs (2,0--11,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi b/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi
index c2cf9a77bbf..c9a0700edf0 100644
--- a/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi
+++ b/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi
@@ -1,3 +1,4 @@
+
 namespace Microsoft.FSharp.Core
 
 open System
@@ -57,4 +58,4 @@ module Operators =
         member Base1 : int
         [<CompiledName("Base2")>]
         /// <summary>Get the lower bound of the array in the second dimension  </summary>
-        member Base2 : int
\ No newline at end of file
+        member Base2 : int
diff --git a/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
index 7930052d179..733a71cb0e0 100644
--- a/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
@@ -9,49 +9,49 @@ SigFile
           [Open
              (ModuleOrNamespace
                 (SynLongIdent ([System], [], [None]),
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (3,5--3,11)),
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (3,0--3,11));
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,5--4,11)),
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,0--4,11));
            Open
              (ModuleOrNamespace
                 (SynLongIdent
                    ([System; Collections; Generic],
-                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,11--4,12);
-                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,23--4,24)],
+                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,11--5,12);
+                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,23--5,24)],
                     [None; None; None]),
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,5--4,31)),
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,0--4,31));
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,5--5,31)),
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,0--5,31));
            Open
              (ModuleOrNamespace
                 (SynLongIdent
                    ([Microsoft; FSharp; Core],
-                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,14--5,15);
-                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,21--5,22)],
+                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,14--6,15);
+                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,21--6,22)],
                     [None; None; None]),
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,5--5,26)),
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,0--5,26));
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,5--6,26)),
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,0--6,26));
            Open
              (ModuleOrNamespace
                 (SynLongIdent
                    ([Microsoft; FSharp; Collections],
-                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,14--6,15);
-                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,21--6,22)],
+                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,14--7,15);
+                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,21--7,22)],
                     [None; None; None]),
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,5--6,33)),
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,0--6,33));
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,5--7,33)),
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,0--7,33));
            Open
              (ModuleOrNamespace
                 (SynLongIdent
                    ([System; Collections],
-                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,11--7,12)],
+                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (8,11--8,12)],
                     [None; None]),
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,5--7,23)),
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,0--7,23));
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (8,5--8,23)),
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (8,0--8,23));
            NestedModule
              (SynComponentInfo
                 ([], None, [], [Tuple],
-                 PreXmlDoc ((10,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 PreXmlDoc ((11,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (10,0--10,12)),
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (11,0--11,12)),
               false,
               [Types
                  ([SynTypeDefnSig
@@ -64,27 +64,27 @@ SigFile
                                 SynTyparDecl ([], SynTypar (T3, None, false));
                                 SynTyparDecl ([], SynTypar (T4, None, false))],
                                [],
-                               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (12,14--12,31))),
+                               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,14--13,31))),
                          [], [Tuple],
-                         PreXmlDoc ((12,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((13,4), FSharp.Compiler.Xml.XmlDocCollector),
                          true, None,
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (12,9--12,14)),
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,9--13,14)),
                       ObjectModel
                         (Unspecified,
                          [Interface
                             (LongIdent
                                (SynLongIdent
                                   ([IStructuralEquatable], [], [None])),
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,8--13,38));
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (14,8--14,38));
                           Interface
                             (LongIdent
                                (SynLongIdent
                                   ([IStructuralComparable], [], [None])),
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (14,8--14,39));
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (15,8--15,39));
                           Interface
                             (LongIdent
                                (SynLongIdent ([IComparable], [], [None])),
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (15,8--15,29));
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,8--16,29));
                           Member
                             (SynValSig
                                ([], SynIdent (new, None),
@@ -95,65 +95,65 @@ SigFile
                                       [Type
                                          (Var
                                             (SynTypar (T1, None, false),
-                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,14--16,17)));
+                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,14--17,17)));
                                        Star
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,18--16,19);
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,18--17,19);
                                        Type
                                          (Var
                                             (SynTypar (T2, None, false),
-                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,20--16,23)));
+                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,20--17,23)));
                                        Star
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,24--16,25);
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,24--17,25);
                                        Type
                                          (Var
                                             (SynTypar (T3, None, false),
-                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,26--16,29)));
+                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,26--17,29)));
                                        Star
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,30--16,31);
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,30--17,31);
                                        Type
                                          (Var
                                             (SynTypar (T4, None, false),
-                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,32--16,35)))],
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,14--16,35)),
+                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,32--17,35)))],
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,14--17,35)),
                                    App
                                      (LongIdent
                                         (SynLongIdent ([Tuple], [], [None])),
                                       Some
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,44--16,45),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,44--17,45),
                                       [Var
                                          (SynTypar (T1, None, false),
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,45--16,48));
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,45--17,48));
                                        Var
                                          (SynTypar (T2, None, false),
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,49--16,52));
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,49--17,52));
                                        Var
                                          (SynTypar (T3, None, false),
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,53--16,56));
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,53--17,56));
                                        Var
                                          (SynTypar (T4, None, false),
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,57--16,60))],
-                                      [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,48--16,49);
-                                       /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,52--16,53);
-                                       /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,56--16,57)],
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,57--17,60))],
+                                      [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,48--17,49);
+                                       /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,52--17,53);
+                                       /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,56--17,57)],
                                       Some
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,60--16,61),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,60--17,61),
                                       false,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,39--16,61)),
-                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,14--16,61),
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,39--17,61)),
+                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,14--17,61),
                                    { ArrowRange =
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,36--16,38) }),
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,36--17,38) }),
                                 SynValInfo
                                   ([[SynArgInfo ([], false, None);
                                      SynArgInfo ([], false, None);
                                      SynArgInfo ([], false, None);
                                      SynArgInfo ([], false, None)]],
                                    SynArgInfo ([], false, None)), false, false,
-                                PreXmlDoc ((16,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                PreXmlDoc ((17,8), FSharp.Compiler.Xml.XmlDocCollector),
                                 None, None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,8--16,61),
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,61),
                                 { LeadingKeyword =
                                    New
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,8--16,11)
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,11)
                                   InlineKeyword = None
                                   WithKeyword = None
                                   EqualsRange = None }),
@@ -163,7 +163,7 @@ SigFile
                                IsFinal = false
                                GetterOrSetterIsCompilerGenerated = false
                                MemberKind = Constructor },
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,8--16,61),
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,61),
                              { GetSetKeywords = None });
                           Member
                             (SynValSig
@@ -171,19 +171,19 @@ SigFile
                                 SynValTyparDecls (None, true),
                                 Var
                                   (SynTypar (T1, None, false),
-                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,23--17,26)),
+                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,23--18,26)),
                                 SynValInfo ([], SynArgInfo ([], false, None)),
                                 false, false,
-                                PreXmlDoc ((17,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                PreXmlDoc ((18,8), FSharp.Compiler.Xml.XmlDocCollector),
                                 None, None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,35),
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,35),
                                 { LeadingKeyword =
                                    Member
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,14)
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,14)
                                   InlineKeyword = None
                                   WithKeyword =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,27--17,31)
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,27--18,31)
                                   EqualsRange = None }),
                              { IsInstance = true
                                IsDispatchSlot = false
@@ -191,30 +191,30 @@ SigFile
                                IsFinal = false
                                GetterOrSetterIsCompilerGenerated = false
                                MemberKind = PropertyGet },
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,35),
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,35),
                              { GetSetKeywords =
                                 Some
                                   (Get
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,32--17,35)) });
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,32--18,35)) });
                           Member
                             (SynValSig
                                ([], SynIdent (Item2, None),
                                 SynValTyparDecls (None, true),
                                 Var
                                   (SynTypar (T2, None, false),
-                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,23--18,26)),
+                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,23--19,26)),
                                 SynValInfo ([], SynArgInfo ([], false, None)),
                                 false, false,
-                                PreXmlDoc ((18,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                PreXmlDoc ((19,8), FSharp.Compiler.Xml.XmlDocCollector),
                                 None, None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,35),
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,35),
                                 { LeadingKeyword =
                                    Member
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,14)
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,14)
                                   InlineKeyword = None
                                   WithKeyword =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,27--18,31)
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,27--19,31)
                                   EqualsRange = None }),
                              { IsInstance = true
                                IsDispatchSlot = false
@@ -222,30 +222,30 @@ SigFile
                                IsFinal = false
                                GetterOrSetterIsCompilerGenerated = false
                                MemberKind = PropertyGet },
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,35),
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,35),
                              { GetSetKeywords =
                                 Some
                                   (Get
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,32--18,35)) });
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,32--19,35)) });
                           Member
                             (SynValSig
                                ([], SynIdent (Item3, None),
                                 SynValTyparDecls (None, true),
                                 Var
                                   (SynTypar (T3, None, false),
-                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,23--19,26)),
+                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,23--20,26)),
                                 SynValInfo ([], SynArgInfo ([], false, None)),
                                 false, false,
-                                PreXmlDoc ((19,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                PreXmlDoc ((20,8), FSharp.Compiler.Xml.XmlDocCollector),
                                 None, None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,35),
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,35),
                                 { LeadingKeyword =
                                    Member
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,14)
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,14)
                                   InlineKeyword = None
                                   WithKeyword =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,27--19,31)
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,27--20,31)
                                   EqualsRange = None }),
                              { IsInstance = true
                                IsDispatchSlot = false
@@ -253,30 +253,30 @@ SigFile
                                IsFinal = false
                                GetterOrSetterIsCompilerGenerated = false
                                MemberKind = PropertyGet },
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,35),
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,35),
                              { GetSetKeywords =
                                 Some
                                   (Get
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,32--19,35)) });
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,32--20,35)) });
                           Member
                             (SynValSig
                                ([], SynIdent (Item4, None),
                                 SynValTyparDecls (None, true),
                                 Var
                                   (SynTypar (T4, None, false),
-                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,23--20,26)),
+                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,23--21,26)),
                                 SynValInfo ([], SynArgInfo ([], false, None)),
                                 false, false,
-                                PreXmlDoc ((20,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                PreXmlDoc ((21,8), FSharp.Compiler.Xml.XmlDocCollector),
                                 None, None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,35),
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,8--21,35),
                                 { LeadingKeyword =
                                    Member
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,14)
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,8--21,14)
                                   InlineKeyword = None
                                   WithKeyword =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,27--20,31)
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,27--21,31)
                                   EqualsRange = None }),
                              { IsInstance = true
                                IsDispatchSlot = false
@@ -284,35 +284,35 @@ SigFile
                                IsFinal = false
                                GetterOrSetterIsCompilerGenerated = false
                                MemberKind = PropertyGet },
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,35),
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,8--21,35),
                              { GetSetKeywords =
                                 Some
                                   (Get
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,32--20,35)) })],
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,8--20,35)),
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,32--21,35)) })],
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (14,8--21,35)),
                       [],
-                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (12,9--20,35),
+                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,9--21,35),
                       { LeadingKeyword =
                          Type
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (12,4--12,8)
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,4--13,8)
                         EqualsRange =
                          Some
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (12,32--12,33)
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,32--13,33)
                         WithKeyword = None })],
-                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (12,4--20,35))],
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (10,0--20,35),
+                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,4--21,35))],
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (11,0--21,35),
               { ModuleKeyword =
                  Some
-                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (10,0--10,6)
+                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (11,0--11,6)
                 EqualsRange =
                  Some
-                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (10,13--10,14) });
+                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (11,13--11,14) });
            NestedModule
              (SynComponentInfo
                 ([], None, [], [Choice],
-                 PreXmlDoc ((23,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 PreXmlDoc ((24,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (23,0--23,13)),
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (24,0--24,13)),
               false,
               [Types
                  ([SynTypeDefnSig
@@ -323,24 +323,24 @@ SigFile
                                 ArgExpr =
                                  Const
                                    (Unit,
-                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,6--26,24))
+                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,6--27,24))
                                 Target = None
                                 AppliesToGetterAndSetter = false
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,6--26,24) };
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,6--27,24) };
                               { TypeName =
                                  SynLongIdent
                                    ([StructuralComparison], [], [None])
                                 ArgExpr =
                                  Const
                                    (Unit,
-                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,26--26,46))
+                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,26--27,46))
                                 Target = None
                                 AppliesToGetterAndSetter = false
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,26--26,46) }]
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,26--27,46) }]
                             Range =
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,4--26,48) };
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,4--27,48) };
                           { Attributes =
                              [{ TypeName =
                                  SynLongIdent ([CompiledName], [], [None])
@@ -349,18 +349,18 @@ SigFile
                                    (Const
                                       (String
                                          ("FSharpChoice`6", Regular,
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,19--27,35)),
-                                       /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,19--27,35)),
-                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,18--27,19),
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,19--28,35)),
+                                       /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,19--28,35)),
+                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,18--28,19),
                                     Some
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,35--27,36),
-                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,18--27,36))
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,35--28,36),
+                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,18--28,36))
                                 Target = None
                                 AppliesToGetterAndSetter = false
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,6--27,36) }]
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,6--28,36) }]
                             Range =
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,4--27,38) }],
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,4--28,38) }],
                          Some
                            (PostfixList
                               ([SynTyparDecl ([], SynTypar (T1, None, false));
@@ -370,11 +370,11 @@ SigFile
                                 SynTyparDecl ([], SynTypar (T5, None, false));
                                 SynTyparDecl ([], SynTypar (T6, None, false))],
                                [],
-                               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,15--28,40))),
+                               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,15--29,40))),
                          [], [Choice],
-                         PreXmlDoc ((26,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((27,4), FSharp.Compiler.Xml.XmlDocCollector),
                          true, None,
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,9--28,15)),
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,9--29,15)),
                       Simple
                         (Union
                            (None,
@@ -385,18 +385,18 @@ SigFile
                                      ([], false, None,
                                       Var
                                         (SynTypar (T1, None, false),
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,22--30,25)),
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (31,22--31,25)),
                                       false,
-                                      PreXmlDoc ((30,22), FSharp.Compiler.Xml.XmlDocCollector),
+                                      PreXmlDoc ((31,22), FSharp.Compiler.Xml.XmlDocCollector),
                                       None,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,22--30,25),
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (31,22--31,25),
                                       { LeadingKeyword = None })],
-                                PreXmlDoc ((30,6), FSharp.Compiler.Xml.XmlDocCollector),
+                                PreXmlDoc ((31,6), FSharp.Compiler.Xml.XmlDocCollector),
                                 None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,6--30,25),
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,6--31,25),
                                 { BarRange =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,6--30,7) });
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (31,6--31,7) });
                              SynUnionCase
                                ([], SynIdent (Choice2Of6, None),
                                 Fields
@@ -404,18 +404,18 @@ SigFile
                                      ([], false, None,
                                       Var
                                         (SynTypar (T2, None, false),
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (32,22--32,25)),
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (33,22--33,25)),
                                       false,
-                                      PreXmlDoc ((32,22), FSharp.Compiler.Xml.XmlDocCollector),
+                                      PreXmlDoc ((33,22), FSharp.Compiler.Xml.XmlDocCollector),
                                       None,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (32,22--32,25),
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (33,22--33,25),
                                       { LeadingKeyword = None })],
-                                PreXmlDoc ((32,6), FSharp.Compiler.Xml.XmlDocCollector),
+                                PreXmlDoc ((33,6), FSharp.Compiler.Xml.XmlDocCollector),
                                 None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (31,6--32,25),
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (32,6--33,25),
                                 { BarRange =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (32,6--32,7) });
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (33,6--33,7) });
                              SynUnionCase
                                ([], SynIdent (Choice3Of6, None),
                                 Fields
@@ -423,18 +423,18 @@ SigFile
                                      ([], false, None,
                                       Var
                                         (SynTypar (T3, None, false),
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (34,22--34,25)),
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (35,22--35,25)),
                                       false,
-                                      PreXmlDoc ((34,22), FSharp.Compiler.Xml.XmlDocCollector),
+                                      PreXmlDoc ((35,22), FSharp.Compiler.Xml.XmlDocCollector),
                                       None,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (34,22--34,25),
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (35,22--35,25),
                                       { LeadingKeyword = None })],
-                                PreXmlDoc ((34,6), FSharp.Compiler.Xml.XmlDocCollector),
+                                PreXmlDoc ((35,6), FSharp.Compiler.Xml.XmlDocCollector),
                                 None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (33,6--34,25),
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (34,6--35,25),
                                 { BarRange =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (34,6--34,7) });
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (35,6--35,7) });
                              SynUnionCase
                                ([], SynIdent (Choice4Of6, None),
                                 Fields
@@ -442,18 +442,18 @@ SigFile
                                      ([], false, None,
                                       Var
                                         (SynTypar (T4, None, false),
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (36,22--36,25)),
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (37,22--37,25)),
                                       false,
-                                      PreXmlDoc ((36,22), FSharp.Compiler.Xml.XmlDocCollector),
+                                      PreXmlDoc ((37,22), FSharp.Compiler.Xml.XmlDocCollector),
                                       None,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (36,22--36,25),
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (37,22--37,25),
                                       { LeadingKeyword = None })],
-                                PreXmlDoc ((36,6), FSharp.Compiler.Xml.XmlDocCollector),
+                                PreXmlDoc ((37,6), FSharp.Compiler.Xml.XmlDocCollector),
                                 None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (35,6--36,25),
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (36,6--37,25),
                                 { BarRange =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (36,6--36,7) });
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (37,6--37,7) });
                              SynUnionCase
                                ([], SynIdent (Choice5Of6, None),
                                 Fields
@@ -461,18 +461,18 @@ SigFile
                                      ([], false, None,
                                       Var
                                         (SynTypar (T5, None, false),
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (38,22--38,25)),
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (39,22--39,25)),
                                       false,
-                                      PreXmlDoc ((38,22), FSharp.Compiler.Xml.XmlDocCollector),
+                                      PreXmlDoc ((39,22), FSharp.Compiler.Xml.XmlDocCollector),
                                       None,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (38,22--38,25),
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (39,22--39,25),
                                       { LeadingKeyword = None })],
-                                PreXmlDoc ((38,6), FSharp.Compiler.Xml.XmlDocCollector),
+                                PreXmlDoc ((39,6), FSharp.Compiler.Xml.XmlDocCollector),
                                 None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (37,6--38,25),
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (38,6--39,25),
                                 { BarRange =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (38,6--38,7) });
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (39,6--39,7) });
                              SynUnionCase
                                ([], SynIdent (Choice6Of6, None),
                                 Fields
@@ -480,37 +480,37 @@ SigFile
                                      ([], false, None,
                                       Var
                                         (SynTypar (T6, None, false),
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (40,22--40,25)),
+                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (41,22--41,25)),
                                       false,
-                                      PreXmlDoc ((40,22), FSharp.Compiler.Xml.XmlDocCollector),
+                                      PreXmlDoc ((41,22), FSharp.Compiler.Xml.XmlDocCollector),
                                       None,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (40,22--40,25),
+                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (41,22--41,25),
                                       { LeadingKeyword = None })],
-                                PreXmlDoc ((40,6), FSharp.Compiler.Xml.XmlDocCollector),
+                                PreXmlDoc ((41,6), FSharp.Compiler.Xml.XmlDocCollector),
                                 None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (39,6--40,25),
+                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (40,6--41,25),
                                 { BarRange =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (40,6--40,7) })],
-                            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,6--40,25)),
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,6--40,25)),
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (41,6--41,7) })],
+                            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,6--41,25)),
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,6--41,25)),
                       [],
-                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (25,4--40,25),
+                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,4--41,25),
                       { LeadingKeyword =
                          Type
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,4--28,8)
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,4--29,8)
                         EqualsRange =
                          Some
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,41--28,42)
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,41--29,42)
                         WithKeyword = None })],
-                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (25,4--40,25))],
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (23,0--40,25),
+                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,4--41,25))],
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (24,0--41,25),
               { ModuleKeyword =
                  Some
-                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (23,0--23,6)
+                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (24,0--24,6)
                 EqualsRange =
                  Some
-                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (23,14--23,15) });
+                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (24,14--24,15) });
            NestedModule
              (SynComponentInfo
                 ([{ Attributes =
@@ -518,17 +518,17 @@ SigFile
                         ArgExpr =
                          Const
                            (Unit,
-                            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (45,2--45,10))
+                            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,2--46,10))
                         Target = None
                         AppliesToGetterAndSetter = false
                         Range =
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (45,2--45,10) }]
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,2--46,10) }]
                     Range =
-                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (45,0--45,12) }],
+                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,0--46,12) }],
                  None, [], [Operators],
-                 PreXmlDoc ((45,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 PreXmlDoc ((46,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,0--46,16)),
+                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (47,0--47,16)),
               false,
               [Types
                  ([SynTypeDefnSig
@@ -538,15 +538,15 @@ SigFile
                            (PostfixList
                               ([SynTyparDecl ([], SynTypar (T, None, false))],
                                [],
-                               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,16--48,20))),
+                               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,16--49,20))),
                          [], [[,]],
-                         PreXmlDoc ((48,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((49,4), FSharp.Compiler.Xml.XmlDocCollector),
                          true, None,
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,9--48,16)),
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,9--49,16)),
                       Simple
                         (None
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,9--60,26),
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,9--60,26)),
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,9--61,26),
+                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,9--61,26)),
                       [Member
                          (SynValSig
                             ([{ Attributes =
@@ -557,29 +557,29 @@ SigFile
                                        (Const
                                           (String
                                              ("Length1", Regular,
-                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,23--49,32)),
-                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,23--49,32)),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,22--49,23),
+                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,23--50,32)),
+                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,23--50,32)),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,22--50,23),
                                         Some
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,32--49,33),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,22--49,33))
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,32--50,33),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,22--50,33))
                                     Target = None
                                     AppliesToGetterAndSetter = false
                                     Range =
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,10--49,33) }]
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,10--50,33) }]
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,8--49,35) }],
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,8--50,35) }],
                              SynIdent (Length1, None),
                              SynValTyparDecls (None, true),
                              LongIdent (SynLongIdent ([int], [], [None])),
                              SynValInfo ([], SynArgInfo ([], false, None)),
                              false, false,
-                             PreXmlDoc ((49,8), FSharp.Compiler.Xml.XmlDocCollector),
+                             PreXmlDoc ((50,8), FSharp.Compiler.Xml.XmlDocCollector),
                              None, None,
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,8--51,28),
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,8--52,28),
                              { LeadingKeyword =
                                 Member
-                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (51,8--51,14)
+                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,8--52,14)
                                InlineKeyword = None
                                WithKeyword = None
                                EqualsRange = None }),
@@ -589,7 +589,7 @@ SigFile
                             IsFinal = false
                             GetterOrSetterIsCompilerGenerated = false
                             MemberKind = PropertyGet },
-                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,8--51,28),
+                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,8--52,28),
                           { GetSetKeywords = None });
                        Member
                          (SynValSig
@@ -601,29 +601,29 @@ SigFile
                                        (Const
                                           (String
                                              ("Length2", Regular,
-                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,23--52,32)),
-                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,23--52,32)),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,22--52,23),
+                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,23--53,32)),
+                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,23--53,32)),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,22--53,23),
                                         Some
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,32--52,33),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,22--52,33))
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,32--53,33),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,22--53,33))
                                     Target = None
                                     AppliesToGetterAndSetter = false
                                     Range =
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,10--52,33) }]
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,10--53,33) }]
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,8--52,35) }],
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,8--53,35) }],
                              SynIdent (Length2, None),
                              SynValTyparDecls (None, true),
                              LongIdent (SynLongIdent ([int], [], [None])),
                              SynValInfo ([], SynArgInfo ([], false, None)),
                              false, false,
-                             PreXmlDoc ((52,8), FSharp.Compiler.Xml.XmlDocCollector),
+                             PreXmlDoc ((53,8), FSharp.Compiler.Xml.XmlDocCollector),
                              None, None,
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,8--54,28),
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,8--55,28),
                              { LeadingKeyword =
                                 Member
-                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (54,8--54,14)
+                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,8--55,14)
                                InlineKeyword = None
                                WithKeyword = None
                                EqualsRange = None }),
@@ -633,7 +633,7 @@ SigFile
                             IsFinal = false
                             GetterOrSetterIsCompilerGenerated = false
                             MemberKind = PropertyGet },
-                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,8--54,28),
+                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,8--55,28),
                           { GetSetKeywords = None });
                        Member
                          (SynValSig
@@ -645,29 +645,29 @@ SigFile
                                        (Const
                                           (String
                                              ("Base1", Regular,
-                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,23--55,30)),
-                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,23--55,30)),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,22--55,23),
+                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,23--56,30)),
+                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,23--56,30)),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,22--56,23),
                                         Some
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,30--55,31),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,22--55,31))
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,30--56,31),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,22--56,31))
                                     Target = None
                                     AppliesToGetterAndSetter = false
                                     Range =
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,10--55,31) }]
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,10--56,31) }]
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,8--55,33) }],
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,8--56,33) }],
                              SynIdent (Base1, None),
                              SynValTyparDecls (None, true),
                              LongIdent (SynLongIdent ([int], [], [None])),
                              SynValInfo ([], SynArgInfo ([], false, None)),
                              false, false,
-                             PreXmlDoc ((55,8), FSharp.Compiler.Xml.XmlDocCollector),
+                             PreXmlDoc ((56,8), FSharp.Compiler.Xml.XmlDocCollector),
                              None, None,
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,8--57,26),
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,8--58,26),
                              { LeadingKeyword =
                                 Member
-                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (57,8--57,14)
+                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,8--58,14)
                                InlineKeyword = None
                                WithKeyword = None
                                EqualsRange = None }),
@@ -677,7 +677,7 @@ SigFile
                             IsFinal = false
                             GetterOrSetterIsCompilerGenerated = false
                             MemberKind = PropertyGet },
-                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,8--57,26),
+                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,8--58,26),
                           { GetSetKeywords = None });
                        Member
                          (SynValSig
@@ -689,29 +689,29 @@ SigFile
                                        (Const
                                           (String
                                              ("Base2", Regular,
-                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,23--58,30)),
-                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,23--58,30)),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,22--58,23),
+                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,23--59,30)),
+                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,23--59,30)),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,22--59,23),
                                         Some
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,30--58,31),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,22--58,31))
+                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,30--59,31),
+                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,22--59,31))
                                     Target = None
                                     AppliesToGetterAndSetter = false
                                     Range =
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,10--58,31) }]
+                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,10--59,31) }]
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,8--58,33) }],
+                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,8--59,33) }],
                              SynIdent (Base2, None),
                              SynValTyparDecls (None, true),
                              LongIdent (SynLongIdent ([int], [], [None])),
                              SynValInfo ([], SynArgInfo ([], false, None)),
                              false, false,
-                             PreXmlDoc ((58,8), FSharp.Compiler.Xml.XmlDocCollector),
+                             PreXmlDoc ((59,8), FSharp.Compiler.Xml.XmlDocCollector),
                              None, None,
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,8--60,26),
+                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,8--61,26),
                              { LeadingKeyword =
                                 Member
-                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (60,8--60,14)
+                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (61,8--61,14)
                                InlineKeyword = None
                                WithKeyword = None
                                EqualsRange = None }),
@@ -721,37 +721,37 @@ SigFile
                             IsFinal = false
                             GetterOrSetterIsCompilerGenerated = false
                             MemberKind = PropertyGet },
-                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,8--60,26),
+                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,8--61,26),
                           { GetSetKeywords = None })],
-                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,9--60,26),
+                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,9--61,26),
                       { LeadingKeyword =
                          Type
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,4--48,8)
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,4--49,8)
                         EqualsRange = None
                         WithKeyword =
                          Some
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,21--48,25) })],
-                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (48,4--60,26))],
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (44,0--60,26),
+                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,21--49,25) })],
+                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,4--61,26))],
+              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (45,0--61,26),
               { ModuleKeyword =
                  Some
-                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,0--46,6)
+                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (47,0--47,6)
                 EqualsRange =
                  Some
-                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,17--46,18) })],
+                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (47,17--47,18) })],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (1,0--60,26),
+          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (2,0--61,26),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (1,0--1,9) })],
+               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,8--50,82);
+            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (51,8--51,82);
           LineComment
-            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,8--53,84);
+            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (54,8--54,84);
           LineComment
-            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,8--56,88);
+            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (57,8--57,88);
           LineComment
-            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,8--59,89)] },
+            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (60,8--60,89)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs
index 71c265303f2..56e71c0fbc7 100644
--- a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs
@@ -1,6 +1,7 @@
+
 try
     let content = tryDownloadFile url
     Some content
 with ex ->
     Infrastructure.ReportWarning ex
-    None
\ No newline at end of file
+    None
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs.bsl
index bf5fee37687..e2f459420f3 100644
--- a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs.bsl
@@ -10,34 +10,34 @@ ImplFile
                    (false, false,
                     [SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
                            None),
                         Named
                           (SynIdent (content, None), false, None,
-                           /root/RangeOfSingleSynMatchClause.fs (2,8--2,15)),
+                           /root/RangeOfSingleSynMatchClause.fs (3,8--3,15)),
                         None,
                         App
                           (NonAtomic, false, Ident tryDownloadFile, Ident url,
-                           /root/RangeOfSingleSynMatchClause.fs (2,18--2,37)),
-                        /root/RangeOfSingleSynMatchClause.fs (2,8--2,15),
-                        Yes /root/RangeOfSingleSynMatchClause.fs (2,4--2,37),
+                           /root/RangeOfSingleSynMatchClause.fs (3,18--3,37)),
+                        /root/RangeOfSingleSynMatchClause.fs (3,8--3,15),
+                        Yes /root/RangeOfSingleSynMatchClause.fs (3,4--3,37),
                         { LeadingKeyword =
-                           Let /root/RangeOfSingleSynMatchClause.fs (2,4--2,7)
+                           Let /root/RangeOfSingleSynMatchClause.fs (3,4--3,7)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/RangeOfSingleSynMatchClause.fs (2,16--2,17) })],
+                             /root/RangeOfSingleSynMatchClause.fs (3,16--3,17) })],
                     App
                       (NonAtomic, false, Ident Some, Ident content,
-                       /root/RangeOfSingleSynMatchClause.fs (3,4--3,16)),
-                    /root/RangeOfSingleSynMatchClause.fs (2,4--3,16),
+                       /root/RangeOfSingleSynMatchClause.fs (4,4--4,16)),
+                    /root/RangeOfSingleSynMatchClause.fs (3,4--4,16),
                     { InKeyword = None }),
                  [SynMatchClause
                     (Named
                        (SynIdent (ex, None), false, None,
-                        /root/RangeOfSingleSynMatchClause.fs (4,5--4,7)), None,
+                        /root/RangeOfSingleSynMatchClause.fs (5,5--5,7)), None,
                      Sequential
                        (SuppressNeither, true,
                         App
@@ -46,28 +46,28 @@ ImplFile
                              (false,
                               SynLongIdent
                                 ([Infrastructure; ReportWarning],
-                                 [/root/RangeOfSingleSynMatchClause.fs (5,18--5,19)],
+                                 [/root/RangeOfSingleSynMatchClause.fs (6,18--6,19)],
                                  [None; None]), None,
-                              /root/RangeOfSingleSynMatchClause.fs (5,4--5,32)),
+                              /root/RangeOfSingleSynMatchClause.fs (6,4--6,32)),
                            Ident ex,
-                           /root/RangeOfSingleSynMatchClause.fs (5,4--5,35)),
+                           /root/RangeOfSingleSynMatchClause.fs (6,4--6,35)),
                         Ident None,
-                        /root/RangeOfSingleSynMatchClause.fs (5,4--6,8)),
-                     /root/RangeOfSingleSynMatchClause.fs (4,5--6,8), Yes,
+                        /root/RangeOfSingleSynMatchClause.fs (6,4--7,8)),
+                     /root/RangeOfSingleSynMatchClause.fs (5,5--7,8), Yes,
                      { ArrowRange =
-                        Some /root/RangeOfSingleSynMatchClause.fs (4,8--4,10)
+                        Some /root/RangeOfSingleSynMatchClause.fs (5,8--5,10)
                        BarRange = None })],
-                 /root/RangeOfSingleSynMatchClause.fs (1,0--6,8),
-                 Yes /root/RangeOfSingleSynMatchClause.fs (1,0--1,3),
-                 Yes /root/RangeOfSingleSynMatchClause.fs (4,0--4,4),
-                 { TryKeyword = /root/RangeOfSingleSynMatchClause.fs (1,0--1,3)
+                 /root/RangeOfSingleSynMatchClause.fs (2,0--7,8),
+                 Yes /root/RangeOfSingleSynMatchClause.fs (2,0--2,3),
+                 Yes /root/RangeOfSingleSynMatchClause.fs (5,0--5,4),
+                 { TryKeyword = /root/RangeOfSingleSynMatchClause.fs (2,0--2,3)
                    TryToWithRange =
-                    /root/RangeOfSingleSynMatchClause.fs (1,0--4,4)
-                   WithKeyword = /root/RangeOfSingleSynMatchClause.fs (4,0--4,4)
+                    /root/RangeOfSingleSynMatchClause.fs (2,0--5,4)
+                   WithKeyword = /root/RangeOfSingleSynMatchClause.fs (5,0--5,4)
                    WithToEndRange =
-                    /root/RangeOfSingleSynMatchClause.fs (4,0--6,8) }),
-              /root/RangeOfSingleSynMatchClause.fs (1,0--6,8))], PreXmlDocEmpty,
-          [], None, /root/RangeOfSingleSynMatchClause.fs (1,0--6,8),
+                    /root/RangeOfSingleSynMatchClause.fs (5,0--7,8) }),
+              /root/RangeOfSingleSynMatchClause.fs (2,0--7,8))], PreXmlDocEmpty,
+          [], None, /root/RangeOfSingleSynMatchClause.fs (2,0--8,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs
index fd16b308f98..d523de5818f 100644
--- a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs
@@ -1,7 +1,8 @@
+
 try
     let content = tryDownloadFile url
     Some content
 with
 | ex ->
     ()
-|
\ No newline at end of file
+|
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
index 4ea2ec2d054..1ecd4f971e6 100644
--- a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
@@ -10,64 +10,64 @@ ImplFile
                    (false, false,
                     [SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
                            None),
                         Named
                           (SynIdent (content, None), false, None,
-                           /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,8--2,15)),
+                           /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,8--3,15)),
                         None,
                         App
                           (NonAtomic, false, Ident tryDownloadFile, Ident url,
-                           /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,18--2,37)),
-                        /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,8--2,15),
+                           /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,18--3,37)),
+                        /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,8--3,15),
                         Yes
-                          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,4--2,37),
+                          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,4--3,37),
                         { LeadingKeyword =
                            Let
-                             /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,4--2,7)
+                             /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,4--3,7)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,16--2,17) })],
+                             /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,16--3,17) })],
                     App
                       (NonAtomic, false, Ident Some, Ident content,
-                       /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,4--3,16)),
-                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,4--3,16),
+                       /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (4,4--4,16)),
+                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,4--4,16),
                     { InKeyword = None }),
                  [SynMatchClause
                     (Named
                        (SynIdent (ex, None), false, None,
-                        /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,2--5,4)),
+                        /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,2--6,4)),
                      None,
                      Const
                        (Unit,
-                        /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,4--6,6)),
-                     /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,2--6,6),
+                        /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (7,4--7,6)),
+                     /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,2--7,6),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,5--5,7)
+                          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,5--6,7)
                        BarRange =
                         Some
-                          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,0--5,1) })],
-                 /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (1,0--7,1),
+                          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,0--6,1) })],
+                 /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--8,1),
                  Yes
-                   /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (1,0--1,3),
+                   /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--2,3),
                  Yes
-                   /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (4,0--4,4),
+                   /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,0--5,4),
                  { TryKeyword =
-                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (1,0--1,3)
+                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--2,3)
                    TryToWithRange =
-                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (1,0--4,4)
+                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--5,4)
                    WithKeyword =
-                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (4,0--4,4)
+                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,0--5,4)
                    WithToEndRange =
-                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (4,0--7,1) }),
-              /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (1,0--7,1))],
+                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,0--8,1) }),
+              /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--8,1))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (1,0--7,1),
+          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--9,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs
index 88fe1fe6738..9d4a1df901d 100644
--- a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs
@@ -1,5 +1,6 @@
+
 try
     let content = tryDownloadFile url
     Some content
 with
-| ex ->
\ No newline at end of file
+| ex ->
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
index ae0657ac519..28bc8db01e1 100644
--- a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
@@ -10,62 +10,62 @@ ImplFile
                    (false, false,
                     [SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
                            None),
                         Named
                           (SynIdent (content, None), false, None,
-                           /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,8--2,15)),
+                           /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,8--3,15)),
                         None,
                         App
                           (NonAtomic, false, Ident tryDownloadFile, Ident url,
-                           /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,18--2,37)),
-                        /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,8--2,15),
+                           /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,18--3,37)),
+                        /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,8--3,15),
                         Yes
-                          /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,4--2,37),
+                          /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,4--3,37),
                         { LeadingKeyword =
                            Let
-                             /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,4--2,7)
+                             /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,4--3,7)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,16--2,17) })],
+                             /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,16--3,17) })],
                     App
                       (NonAtomic, false, Ident Some, Ident content,
-                       /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,4--3,16)),
-                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,4--3,16),
+                       /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (4,4--4,16)),
+                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,4--4,16),
                     { InKeyword = None }),
                  [SynMatchClause
                     (Named
                        (SynIdent (ex, None), false, None,
-                        /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,2--5,4)),
+                        /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (6,2--6,4)),
                      None,
                      ArbitraryAfterError
                        ("patternClauses2",
-                        /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,4--5,4)),
-                     /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,2--5,4),
+                        /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (6,4--6,4)),
+                     /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (6,2--6,4),
                      Yes,
                      { ArrowRange = None
                        BarRange =
                         Some
-                          /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,0--5,1) })],
-                 /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (1,0--5,4),
+                          /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (6,0--6,1) })],
+                 /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--6,4),
                  Yes
-                   /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (1,0--1,3),
+                   /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--2,3),
                  Yes
-                   /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (4,0--4,4),
+                   /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,0--5,4),
                  { TryKeyword =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (1,0--1,3)
+                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--2,3)
                    TryToWithRange =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (1,0--4,4)
+                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--5,4)
                    WithKeyword =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (4,0--4,4)
+                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,0--5,4)
                    WithToEndRange =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (4,0--5,4) }),
-              /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (1,0--5,4))],
+                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,0--6,4) }),
+              /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--6,4))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (1,0--5,7),
+          /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs
index 6bdda262153..9740c151f9e 100644
--- a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs
@@ -1,5 +1,6 @@
+
 try
     let content = tryDownloadFile url
     Some content
 with
-| ex when (isNull ex) ->
\ No newline at end of file
+| ex when (isNull ex) ->
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
index 911289c12f7..699d00ea747 100644
--- a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
@@ -12,70 +12,70 @@ ImplFile
                    (false, false,
                     [SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
                            None),
                         Named
                           (SynIdent (content, None), false, None,
-                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,8--2,15)),
+                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,8--3,15)),
                         None,
                         App
                           (NonAtomic, false, Ident tryDownloadFile, Ident url,
-                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,18--2,37)),
-                        /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,8--2,15),
+                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,18--3,37)),
+                        /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,8--3,15),
                         Yes
-                          /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,4--2,37),
+                          /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,4--3,37),
                         { LeadingKeyword =
                            Let
-                             /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,4--2,7)
+                             /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,4--3,7)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,16--2,17) })],
+                             /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,16--3,17) })],
                     App
                       (NonAtomic, false, Ident Some, Ident content,
-                       /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,4--3,16)),
-                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,4--3,16),
+                       /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (4,4--4,16)),
+                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,4--4,16),
                     { InKeyword = None }),
                  [SynMatchClause
                     (Named
                        (SynIdent (ex, None), false, None,
-                        /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,2--5,4)),
+                        /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,2--6,4)),
                      Some
                        (Paren
                           (App
                              (NonAtomic, false, Ident isNull, Ident ex,
-                              /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,11--5,20)),
-                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,10--5,11),
+                              /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,11--6,20)),
+                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,10--6,11),
                            Some
-                             /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,20--5,21),
-                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,10--5,21))),
+                             /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,20--6,21),
+                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,10--6,21))),
                      ArbitraryAfterError
                        ("patternClauses2",
-                        /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,21--5,21)),
-                     /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,2--5,21),
+                        /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,21--6,21)),
+                     /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,2--6,21),
                      Yes,
                      { ArrowRange = None
                        BarRange =
                         Some
-                          /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,0--5,1) })],
-                 /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (1,0--5,21),
+                          /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,0--6,1) })],
+                 /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--6,21),
                  Yes
-                   /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (1,0--1,3),
+                   /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--2,3),
                  Yes
-                   /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (4,0--4,4),
+                   /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,0--5,4),
                  { TryKeyword =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (1,0--1,3)
+                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--2,3)
                    TryToWithRange =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (1,0--4,4)
+                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--5,4)
                    WithKeyword =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (4,0--4,4)
+                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,0--5,4)
                    WithToEndRange =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (4,0--5,21) }),
-              /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (1,0--5,21))],
+                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,0--6,21) }),
+              /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--6,21))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (1,0--5,24),
+          /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi
index a19e0a87714..95397d5158d 100644
--- a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi
@@ -1,3 +1,4 @@
+
 namespace Y
 type MyFunction =
-    delegate of int -> string
\ No newline at end of file
+    delegate of int -> string
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
index 54ae1c87b83..5741b0536e0 100644
--- a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
@@ -9,17 +9,17 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [MyFunction],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,5--2,15)),
+                     /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,5--3,15)),
                   ObjectModel
                     (Delegate
                        (Fun
                           (LongIdent (SynLongIdent ([int], [], [None])),
                            LongIdent (SynLongIdent ([string], [], [None])),
-                           /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,16--3,29),
+                           /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,16--4,29),
                            { ArrowRange =
-                              /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,20--3,22) }),
+                              /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,20--4,22) }),
                         SynValInfo
                           ([[SynArgInfo ([], false, None)]],
                            SynArgInfo ([], false, None))),
@@ -30,14 +30,14 @@ SigFile
                             Fun
                               (LongIdent (SynLongIdent ([int], [], [None])),
                                LongIdent (SynLongIdent ([string], [], [None])),
-                               /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,16--3,29),
+                               /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,16--4,29),
                                { ArrowRange =
-                                  /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,20--3,22) }),
+                                  /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,20--4,22) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]],
                                SynArgInfo ([], false, None)), false, false,
                             PreXmlDocEmpty, None, None,
-                            /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,4--3,29),
+                            /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,4--4,29),
                             { LeadingKeyword = Synthetic
                               InlineKeyword = None
                               WithKeyword = None
@@ -48,23 +48,23 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,4--3,29),
+                         /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,4--4,29),
                          { GetSetKeywords = None })],
-                     /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,4--3,29)),
+                     /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,4--4,29)),
                   [],
-                  /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,5--3,29),
+                  /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,5--4,29),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,0--2,4)
+                       /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,0--3,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,16--2,17)
+                       /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,16--3,17)
                     WithKeyword = None })],
-              /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,0--3,29))],
+              /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,0--4,29))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (1,0--3,29),
+          /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,0--4,29),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (1,0--1,9) })],
+               /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi
index 9a51ffef4b7..eae604f2d16 100644
--- a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi
@@ -1,5 +1,6 @@
+
 namespace X
 type MyRecord =
     class
     end
-    member Score : unit -> int
\ No newline at end of file
+    member Score : unit -> int
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
index 9c1b9ef85ae..3ecd8606f49 100644
--- a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
@@ -9,12 +9,12 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [MyRecord],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,5--2,13)),
+                     /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,5--3,13)),
                   ObjectModel
                     (Class, [],
-                     /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,4--4,7)),
+                     /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (4,4--5,7)),
                   [Member
                      (SynValSig
                         ([], SynIdent (Score, None),
@@ -22,18 +22,18 @@ SigFile
                          Fun
                            (LongIdent (SynLongIdent ([unit], [], [None])),
                             LongIdent (SynLongIdent ([int], [], [None])),
-                            /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (5,19--5,30),
+                            /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,19--6,30),
                             { ArrowRange =
-                               /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (5,24--5,26) }),
+                               /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,24--6,26) }),
                          SynValInfo
                            ([[SynArgInfo ([], false, None)]],
                             SynArgInfo ([], false, None)), false, false,
-                         PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None, None,
-                         /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (5,4--5,30),
+                         /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,4--6,30),
                          { LeadingKeyword =
                             Member
-                              /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (5,4--5,10)
+                              /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,4--6,10)
                            InlineKeyword = None
                            WithKeyword = None
                            EqualsRange = None }),
@@ -43,21 +43,21 @@ SigFile
                         IsFinal = false
                         GetterOrSetterIsCompilerGenerated = false
                         MemberKind = Member },
-                      /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (5,4--5,30),
+                      /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,4--6,30),
                       { GetSetKeywords = None })],
-                  /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,5--5,30),
+                  /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,5--6,30),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,0--2,4)
+                       /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,0--3,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,14--2,15)
+                       /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,14--3,15)
                     WithKeyword = None })],
-              /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,0--5,30))],
+              /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,0--6,30))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (1,0--5,30),
+          /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,0--6,30),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (1,0--1,9) })],
+               /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi
index fa01c200519..47a468096f4 100644
--- a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi
@@ -1,4 +1,5 @@
+
 namespace X
 type MyRecord =
     { Level: int }
-    member Score : unit -> int
\ No newline at end of file
+    member Score : unit -> int
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
index 3283c0238e3..da7ce65bfe1 100644
--- a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
@@ -9,21 +9,21 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [MyRecord],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,5--2,13)),
+                     /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,5--3,13)),
                   Simple
                     (Record
                        (None,
                         [SynField
                            ([], false, Some Level,
                             LongIdent (SynLongIdent ([int], [], [None])), false,
-                            PreXmlDoc ((3,6), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((4,6), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,6--3,16),
+                            /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,6--4,16),
                             { LeadingKeyword = None })],
-                        /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,4--3,18)),
-                     /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,4--3,18)),
+                        /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,4--4,18)),
+                     /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,4--4,18)),
                   [Member
                      (SynValSig
                         ([], SynIdent (Score, None),
@@ -31,18 +31,18 @@ SigFile
                          Fun
                            (LongIdent (SynLongIdent ([unit], [], [None])),
                             LongIdent (SynLongIdent ([int], [], [None])),
-                            /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,19--4,30),
+                            /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,19--5,30),
                             { ArrowRange =
-                               /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,24--4,26) }),
+                               /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,24--5,26) }),
                          SynValInfo
                            ([[SynArgInfo ([], false, None)]],
                             SynArgInfo ([], false, None)), false, false,
-                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None, None,
-                         /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,4--4,30),
+                         /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,4--5,30),
                          { LeadingKeyword =
                             Member
-                              /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,4--4,10)
+                              /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,4--5,10)
                            InlineKeyword = None
                            WithKeyword = None
                            EqualsRange = None }),
@@ -52,21 +52,21 @@ SigFile
                         IsFinal = false
                         GetterOrSetterIsCompilerGenerated = false
                         MemberKind = Member },
-                      /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,4--4,30),
+                      /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,4--5,30),
                       { GetSetKeywords = None })],
-                  /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,5--4,30),
+                  /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,5--5,30),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,0--2,4)
+                       /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,0--3,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,14--2,15)
+                       /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,14--3,15)
                     WithKeyword = None })],
-              /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,0--4,30))],
+              /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,0--5,30))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (1,0--4,30),
+          /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,0--5,30),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (1,0--1,9) })],
+               /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi
index 5965da40bba..6d2b999673c 100644
--- a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi
@@ -1,4 +1,5 @@
+
 namespace Z
 type SomeCollection with
     val LastIndex : int
-    val SomeThingElse : int -> string
\ No newline at end of file
+    val SomeThingElse : int -> string
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
index 30be3c8a341..3112e7b054d 100644
--- a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
@@ -8,56 +8,56 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [SomeCollection],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,5--2,19)),
+                     /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,5--3,19)),
                   Simple
                     (None
-                       /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,5--4,37),
-                     /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,5--4,37)),
+                       /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,5--5,37),
+                     /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,5--5,37)),
                   [ValField
                      (SynField
                         ([], false, Some LastIndex,
                          LongIdent (SynLongIdent ([int], [], [None])), false,
-                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None,
-                         /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,4--3,23),
+                         /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,23),
                          { LeadingKeyword =
                             Some
                               (Val
-                                 /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,4--3,7)) }),
-                      /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,4--3,23));
+                                 /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,7)) }),
+                      /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,23));
                    ValField
                      (SynField
                         ([], false, Some SomeThingElse,
                          Fun
                            (LongIdent (SynLongIdent ([int], [], [None])),
                             LongIdent (SynLongIdent ([string], [], [None])),
-                            /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,24--4,37),
+                            /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,24--5,37),
                             { ArrowRange =
-                               /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,28--4,30) }),
+                               /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,28--5,30) }),
                          false,
-                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None,
-                         /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,37),
+                         /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,4--5,37),
                          { LeadingKeyword =
                             Some
                               (Val
-                                 /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,7)) }),
-                      /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,37))],
-                  /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,5--4,37),
+                                 /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,4--5,7)) }),
+                      /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,4--5,37))],
+                  /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,5--5,37),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,0--2,4)
+                       /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,0--3,4)
                     EqualsRange = None
                     WithKeyword =
                      Some
-                       /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,20--2,24) })],
-              /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,0--4,37))],
+                       /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,20--3,24) })],
+              /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,0--5,37))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (1,0--4,37),
+          /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,0--5,37),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (1,0--1,9) })],
+               /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi b/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi
index 990511b5d81..56f1a8975c8 100644
--- a/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi
+++ b/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi
@@ -1,3 +1,4 @@
+
 namespace GreatProjectThing
 
 type Meh =
@@ -5,4 +6,4 @@ type Meh =
         end
 
 
-// foo
\ No newline at end of file
+// foo
diff --git a/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
index 8adc3416a58..7fefb8220ff 100644
--- a/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
@@ -8,24 +8,24 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Meh],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfTypeShouldEndAtEndKeyword.fsi (3,5--3,8)),
+                     /root/RangeOfTypeShouldEndAtEndKeyword.fsi (4,5--4,8)),
                   ObjectModel
                     (Class, [],
-                     /root/RangeOfTypeShouldEndAtEndKeyword.fsi (4,8--5,11)), [],
-                  /root/RangeOfTypeShouldEndAtEndKeyword.fsi (3,5--5,11),
+                     /root/RangeOfTypeShouldEndAtEndKeyword.fsi (5,8--6,11)), [],
+                  /root/RangeOfTypeShouldEndAtEndKeyword.fsi (4,5--6,11),
                   { LeadingKeyword =
-                     Type /root/RangeOfTypeShouldEndAtEndKeyword.fsi (3,0--3,4)
+                     Type /root/RangeOfTypeShouldEndAtEndKeyword.fsi (4,0--4,4)
                     EqualsRange =
-                     Some /root/RangeOfTypeShouldEndAtEndKeyword.fsi (3,9--3,10)
+                     Some /root/RangeOfTypeShouldEndAtEndKeyword.fsi (4,9--4,10)
                     WithKeyword = None })],
-              /root/RangeOfTypeShouldEndAtEndKeyword.fsi (3,0--5,11))],
+              /root/RangeOfTypeShouldEndAtEndKeyword.fsi (4,0--6,11))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfTypeShouldEndAtEndKeyword.fsi (1,0--5,11),
+          /root/RangeOfTypeShouldEndAtEndKeyword.fsi (2,0--6,11),
           { LeadingKeyword =
-             Namespace /root/RangeOfTypeShouldEndAtEndKeyword.fsi (1,0--1,9) })],
+             Namespace /root/RangeOfTypeShouldEndAtEndKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/RangeOfTypeShouldEndAtEndKeyword.fsi (8,0--8,6)] },
+         [LineComment /root/RangeOfTypeShouldEndAtEndKeyword.fsi (9,0--9,6)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
index 68f597f45be..ca1f783a2c3 100644
--- a/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
@@ -1,3 +1,4 @@
+
 type Foo() =
     // A read-only property.
-    member this.MyReadProperty with get () = myInternalValue
\ No newline at end of file
+    member this.MyReadProperty with get () = myInternalValue
diff --git a/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
index 75bff088506..a4d6ce903fc 100644
--- a/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -12,26 +12,26 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                     /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                            /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                          None,
-                         PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                         PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                          { AsKeyword = None });
                       GetSetMember
                         (Some
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -46,62 +46,62 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadProperty],
-                                     [/root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,15--3,16)],
+                                     [/root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,15--4,16)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,40--3,42)),
-                                        /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,40--3,42))],
+                                           /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,40--4,42)),
+                                        /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,40--4,42))],
                                   None,
-                                  /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,36--3,42)),
+                                  /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,36--4,42)),
                                None, Ident myInternalValue,
-                               /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,36--3,42),
+                               /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,36--4,42),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,10)
+                                    /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,43--3,44) })),
+                                    /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,43--4,44) })),
                          None,
-                         /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,60),
+                         /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,60),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,31--3,35)
+                            /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,31--4,35)
                            GetKeyword =
                             Some
-                              /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,36--3,39)
+                              /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,36--4,39)
                            AndKeyword = None
                            SetKeyword = None })],
-                     /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,60)),
+                     /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,60)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                           /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                         None,
-                        PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                        PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                         { AsKeyword = None })),
-                  /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--3,60),
+                  /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--4,60),
                   { LeadingKeyword =
                      Type
-                       /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                       /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,11--1,12)
+                       /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--3,60))],
+              /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--4,60))],
           PreXmlDocEmpty, [], None,
-          /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--3,60),
+          /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,4--2,28)] },
+            /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,28)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
index 358e2d3401e..a08b721bb35 100644
--- a/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
@@ -1,5 +1,6 @@
+
 type Foo() =
     // A read-write property.
     member this.MyReadWriteProperty
         with get () = myInternalValue
-        and set (value) = myInternalValue <- value
\ No newline at end of file
+        and set (value) = myInternalValue <- value
diff --git a/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
index 70113df7ff9..ec6f913b7ec 100644
--- a/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -12,26 +12,26 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                     /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                            /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                          None,
-                         PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                         PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                          { AsKeyword = None });
                       GetSetMember
                         (Some
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -46,31 +46,31 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadWriteProperty],
-                                     [/root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,15--3,16)],
+                                     [/root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,15--4,16)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,17--4,19)),
-                                        /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,17--4,19))],
+                                           /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,17--5,19)),
+                                        /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,17--5,19))],
                                   None,
-                                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,13--4,19)),
+                                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,13--5,19)),
                                None, Ident myInternalValue,
-                               /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,13--4,19),
+                               /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,13--5,19),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,10)
+                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,20--4,21) })),
+                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,20--5,21) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -86,69 +86,69 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadWriteProperty],
-                                     [/root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,15--3,16)],
+                                     [/root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,15--4,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Named
                                           (SynIdent (value, None), false, None,
-                                           /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,17--5,22)),
-                                        /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,16--5,23))],
+                                           /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,17--6,22)),
+                                        /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,16--6,23))],
                                   None,
-                                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,12--5,23)),
+                                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,12--6,23)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([myInternalValue], [], [None]),
                                   Ident value,
-                                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,26--5,50)),
-                               /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,12--5,23),
+                                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,26--6,50)),
+                               /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,12--6,23),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,10)
+                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,24--5,25) })),
-                         /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--5,50),
+                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,24--6,25) })),
+                         /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--6,50),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,8--4,12)
+                            /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,8--5,12)
                            GetKeyword =
                             Some
-                              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,13--4,16)
+                              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,13--5,16)
                            AndKeyword =
                             Some
-                              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,8--5,11)
+                              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,8--6,11)
                            SetKeyword =
                             Some
-                              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,12--5,15) })],
-                     /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--5,50)),
+                              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,12--6,15) })],
+                     /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--6,50)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                           /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                         None,
-                        PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                        PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                         { AsKeyword = None })),
-                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--5,50),
+                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--6,50),
                   { LeadingKeyword =
                      Type
-                       /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                       /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,11--1,12)
+                       /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--5,50))],
+              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--6,50))],
           PreXmlDocEmpty, [], None,
-          /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--5,50),
+          /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,4--2,29)] },
+            /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,29)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs b/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs
index 28d0a8f682d..554a8565f75 100644
--- a/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs
+++ b/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs
@@ -1 +1,2 @@
-#I \"/tmp\"
\ No newline at end of file
+
+#I \"/tmp\"
diff --git a/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs.bsl
index 2e3c88281dd..4d4f4378c4f 100644
--- a/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs.bsl
+++ b/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs.bsl
@@ -7,10 +7,10 @@ ImplFile
           [HashDirective
              (ParsedHashDirective
                 ("I", [],
-                 /root/RegularStringAsParsedHashDirectiveArgument.fs (1,0--1,2)),
-              /root/RegularStringAsParsedHashDirectiveArgument.fs (1,0--1,4))],
+                 /root/RegularStringAsParsedHashDirectiveArgument.fs (2,0--2,2)),
+              /root/RegularStringAsParsedHashDirectiveArgument.fs (2,0--2,4))],
           PreXmlDocEmpty, [], None,
-          /root/RegularStringAsParsedHashDirectiveArgument.fs (1,0--1,4),
+          /root/RegularStringAsParsedHashDirectiveArgument.fs (2,0--2,4),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi b/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi
index 5200f8832c5..4810bfe32ee 100644
--- a/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi
+++ b/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi
@@ -1,7 +1,8 @@
+
 module Meh
 
 type X =
     // MemberSig.Member
     member Y : int
                     with
-                                get
\ No newline at end of file
+                                get
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi.bsl b/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi.bsl
index 9327a566e57..e7f98f7ac9a 100644
--- a/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi.bsl
@@ -7,8 +7,8 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/SignatureMemberWithGet.fsi (3,5--3,6)),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/SignatureMemberWithGet.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -18,16 +18,16 @@ SigFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SignatureMemberWithGet.fsi (5,4--7,35),
+                            /root/SignatureMemberWithGet.fsi (6,4--8,35),
                             { LeadingKeyword =
                                Member
-                                 /root/SignatureMemberWithGet.fsi (5,4--5,10)
+                                 /root/SignatureMemberWithGet.fsi (6,4--6,10)
                               InlineKeyword = None
                               WithKeyword =
                                Some
-                                 /root/SignatureMemberWithGet.fsi (6,20--6,24)
+                                 /root/SignatureMemberWithGet.fsi (7,20--7,24)
                               EqualsRange = None }),
                          { IsInstance = true
                            IsDispatchSlot = false
@@ -35,21 +35,21 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SignatureMemberWithGet.fsi (5,4--7,35),
+                         /root/SignatureMemberWithGet.fsi (6,4--8,35),
                          { GetSetKeywords =
                             Some
-                              (Get /root/SignatureMemberWithGet.fsi (7,32--7,35)) })],
-                     /root/SignatureMemberWithGet.fsi (5,4--7,35)), [],
-                  /root/SignatureMemberWithGet.fsi (3,5--7,35),
+                              (Get /root/SignatureMemberWithGet.fsi (8,32--8,35)) })],
+                     /root/SignatureMemberWithGet.fsi (6,4--8,35)), [],
+                  /root/SignatureMemberWithGet.fsi (4,5--8,35),
                   { LeadingKeyword =
-                     Type /root/SignatureMemberWithGet.fsi (3,0--3,4)
+                     Type /root/SignatureMemberWithGet.fsi (4,0--4,4)
                     EqualsRange =
-                     Some /root/SignatureMemberWithGet.fsi (3,7--3,8)
+                     Some /root/SignatureMemberWithGet.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/SignatureMemberWithGet.fsi (3,0--7,35))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/SignatureMemberWithGet.fsi (1,0--7,35),
-          { LeadingKeyword = Module /root/SignatureMemberWithGet.fsi (1,0--1,6) })],
+              /root/SignatureMemberWithGet.fsi (4,0--8,35))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/SignatureMemberWithGet.fsi (2,0--8,35),
+          { LeadingKeyword = Module /root/SignatureMemberWithGet.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/SignatureMemberWithGet.fsi (4,4--4,23)] }, set []))
\ No newline at end of file
+         [LineComment /root/SignatureMemberWithGet.fsi (5,4--5,23)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi b/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi
index d081b432e66..291d0e631d3 100644
--- a/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi
+++ b/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi
@@ -1,7 +1,8 @@
+
 module Meh
 
 type X =
     // MemberSig.Member
     member Y : int
                     with
-                            set  ,  get
\ No newline at end of file
+                            set  ,  get
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi.bsl b/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi.bsl
index 503931f8b7e..0be2e9e4245 100644
--- a/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi.bsl
@@ -7,9 +7,9 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SignatureMemberWithSet,get.fsi (3,5--3,6)),
+                     /root/SignatureMemberWithSet,get.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -19,16 +19,16 @@ SigFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SignatureMemberWithSet,get.fsi (5,4--7,39),
+                            /root/SignatureMemberWithSet,get.fsi (6,4--8,39),
                             { LeadingKeyword =
                                Member
-                                 /root/SignatureMemberWithSet,get.fsi (5,4--5,10)
+                                 /root/SignatureMemberWithSet,get.fsi (6,4--6,10)
                               InlineKeyword = None
                               WithKeyword =
                                Some
-                                 /root/SignatureMemberWithSet,get.fsi (6,20--6,24)
+                                 /root/SignatureMemberWithSet,get.fsi (7,20--7,24)
                               EqualsRange = None }),
                          { IsInstance = true
                            IsDispatchSlot = false
@@ -36,25 +36,25 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGetSet },
-                         /root/SignatureMemberWithSet,get.fsi (5,4--7,39),
+                         /root/SignatureMemberWithSet,get.fsi (6,4--8,39),
                          { GetSetKeywords =
                             Some
                               (GetSet
-                                 (/root/SignatureMemberWithSet,get.fsi (7,36--7,39),
-                                  /root/SignatureMemberWithSet,get.fsi (7,28--7,31))) })],
-                     /root/SignatureMemberWithSet,get.fsi (5,4--7,39)), [],
-                  /root/SignatureMemberWithSet,get.fsi (3,5--7,39),
+                                 (/root/SignatureMemberWithSet,get.fsi (8,36--8,39),
+                                  /root/SignatureMemberWithSet,get.fsi (8,28--8,31))) })],
+                     /root/SignatureMemberWithSet,get.fsi (6,4--8,39)), [],
+                  /root/SignatureMemberWithSet,get.fsi (4,5--8,39),
                   { LeadingKeyword =
-                     Type /root/SignatureMemberWithSet,get.fsi (3,0--3,4)
+                     Type /root/SignatureMemberWithSet,get.fsi (4,0--4,4)
                     EqualsRange =
-                     Some /root/SignatureMemberWithSet,get.fsi (3,7--3,8)
+                     Some /root/SignatureMemberWithSet,get.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/SignatureMemberWithSet,get.fsi (3,0--7,39))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/SignatureMemberWithSet,get.fsi (1,0--7,39),
+              /root/SignatureMemberWithSet,get.fsi (4,0--8,39))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/SignatureMemberWithSet,get.fsi (2,0--8,39),
           { LeadingKeyword =
-             Module /root/SignatureMemberWithSet,get.fsi (1,0--1,6) })],
+             Module /root/SignatureMemberWithSet,get.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/SignatureMemberWithSet,get.fsi (4,4--4,23)] },
+         [LineComment /root/SignatureMemberWithSet,get.fsi (5,4--5,23)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi b/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi
index 9fa04282c33..e20ff57b323 100644
--- a/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi
+++ b/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi
@@ -1,7 +1,8 @@
+
 module Meh
 
 type X =
     // MemberSig.Member
     member Y : int
                     with
-                            set
\ No newline at end of file
+                            set
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi.bsl b/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi.bsl
index 31913973448..64ac81c24f9 100644
--- a/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi.bsl
@@ -7,8 +7,8 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/SignatureMemberWithSet.fsi (3,5--3,6)),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/SignatureMemberWithSet.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -18,16 +18,16 @@ SigFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SignatureMemberWithSet.fsi (5,4--7,31),
+                            /root/SignatureMemberWithSet.fsi (6,4--8,31),
                             { LeadingKeyword =
                                Member
-                                 /root/SignatureMemberWithSet.fsi (5,4--5,10)
+                                 /root/SignatureMemberWithSet.fsi (6,4--6,10)
                               InlineKeyword = None
                               WithKeyword =
                                Some
-                                 /root/SignatureMemberWithSet.fsi (6,20--6,24)
+                                 /root/SignatureMemberWithSet.fsi (7,20--7,24)
                               EqualsRange = None }),
                          { IsInstance = true
                            IsDispatchSlot = false
@@ -35,21 +35,21 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         /root/SignatureMemberWithSet.fsi (5,4--7,31),
+                         /root/SignatureMemberWithSet.fsi (6,4--8,31),
                          { GetSetKeywords =
                             Some
-                              (Set /root/SignatureMemberWithSet.fsi (7,28--7,31)) })],
-                     /root/SignatureMemberWithSet.fsi (5,4--7,31)), [],
-                  /root/SignatureMemberWithSet.fsi (3,5--7,31),
+                              (Set /root/SignatureMemberWithSet.fsi (8,28--8,31)) })],
+                     /root/SignatureMemberWithSet.fsi (6,4--8,31)), [],
+                  /root/SignatureMemberWithSet.fsi (4,5--8,31),
                   { LeadingKeyword =
-                     Type /root/SignatureMemberWithSet.fsi (3,0--3,4)
+                     Type /root/SignatureMemberWithSet.fsi (4,0--4,4)
                     EqualsRange =
-                     Some /root/SignatureMemberWithSet.fsi (3,7--3,8)
+                     Some /root/SignatureMemberWithSet.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/SignatureMemberWithSet.fsi (3,0--7,31))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/SignatureMemberWithSet.fsi (1,0--7,31),
-          { LeadingKeyword = Module /root/SignatureMemberWithSet.fsi (1,0--1,6) })],
+              /root/SignatureMemberWithSet.fsi (4,0--8,31))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/SignatureMemberWithSet.fsi (2,0--8,31),
+          { LeadingKeyword = Module /root/SignatureMemberWithSet.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/SignatureMemberWithSet.fsi (4,4--4,23)] }, set []))
\ No newline at end of file
+         [LineComment /root/SignatureMemberWithSet.fsi (5,4--5,23)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs
index c9358583520..4ed2878ab9d 100644
--- a/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs
+++ b/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs
@@ -1 +1,2 @@
-fun x -> x
\ No newline at end of file
+
+fun x -> x
diff --git a/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs.bsl
index 3f9c1aae155..01a70e5a10b 100644
--- a/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs.bsl
@@ -10,17 +10,17 @@ ImplFile
                  SimplePats
                    ([Id
                        (x, None, false, false, false,
-                        /root/SimpleLambdaHasArrowRange.fs (1,4--1,5))],
-                    /root/SimpleLambdaHasArrowRange.fs (1,4--1,5)), Ident x,
+                        /root/SimpleLambdaHasArrowRange.fs (2,4--2,5))],
+                    /root/SimpleLambdaHasArrowRange.fs (2,4--2,5)), Ident x,
                  Some
                    ([Named
                        (SynIdent (x, None), false, None,
-                        /root/SimpleLambdaHasArrowRange.fs (1,4--1,5))], Ident x),
-                 /root/SimpleLambdaHasArrowRange.fs (1,0--1,10),
+                        /root/SimpleLambdaHasArrowRange.fs (2,4--2,5))], Ident x),
+                 /root/SimpleLambdaHasArrowRange.fs (2,0--2,10),
                  { ArrowRange =
-                    Some /root/SimpleLambdaHasArrowRange.fs (1,6--1,8) }),
-              /root/SimpleLambdaHasArrowRange.fs (1,0--1,10))], PreXmlDocEmpty,
-          [], None, /root/SimpleLambdaHasArrowRange.fs (1,0--1,10),
+                    Some /root/SimpleLambdaHasArrowRange.fs (2,6--2,8) }),
+              /root/SimpleLambdaHasArrowRange.fs (2,0--2,10))], PreXmlDocEmpty,
+          [], None, /root/SimpleLambdaHasArrowRange.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi b/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi
index 48867256ceb..f6938574da6 100644
--- a/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi
+++ b/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi
@@ -1,3 +1,4 @@
+
 namespace Foobar
 
 val v : int =
@@ -5,4 +6,4 @@ val v : int =
     30
     #else
     42
-    #endif
\ No newline at end of file
+    #endif
diff --git a/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi.bsl
index 7bbb6a63531..2bfc733669f 100644
--- a/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi.bsl
@@ -9,27 +9,27 @@ SigFile
                 ([], SynIdent (v, None), SynValTyparDecls (None, true),
                  LongIdent (SynLongIdent ([int], [], [None])),
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
                  Some
                    (Const
                       (Int32 42,
-                       /root/SingleIfElseEndif,SignatureFile.fsi (7,4--7,6))),
-                 /root/SingleIfElseEndif,SignatureFile.fsi (3,0--7,6),
+                       /root/SingleIfElseEndif,SignatureFile.fsi (8,4--8,6))),
+                 /root/SingleIfElseEndif,SignatureFile.fsi (4,0--8,6),
                  { LeadingKeyword =
-                    Val /root/SingleIfElseEndif,SignatureFile.fsi (3,0--3,3)
+                    Val /root/SingleIfElseEndif,SignatureFile.fsi (4,0--4,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange =
-                    Some /root/SingleIfElseEndif,SignatureFile.fsi (3,12--3,13) }),
-              /root/SingleIfElseEndif,SignatureFile.fsi (3,0--7,6))],
+                    Some /root/SingleIfElseEndif,SignatureFile.fsi (4,12--4,13) }),
+              /root/SingleIfElseEndif,SignatureFile.fsi (4,0--8,6))],
           PreXmlDocEmpty, [], None,
-          /root/SingleIfElseEndif,SignatureFile.fsi (1,0--7,6),
+          /root/SingleIfElseEndif,SignatureFile.fsi (2,0--8,6),
           { LeadingKeyword =
-             Namespace /root/SingleIfElseEndif,SignatureFile.fsi (1,0--1,9) })],
+             Namespace /root/SingleIfElseEndif,SignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives =
          [If
             (Ident "DEBUG",
-             /root/SingleIfElseEndif,SignatureFile.fsi (4,4--4,13));
-          Else /root/SingleIfElseEndif,SignatureFile.fsi (6,4--6,9);
-          EndIf /root/SingleIfElseEndif,SignatureFile.fsi (8,4--8,10)]
+             /root/SingleIfElseEndif,SignatureFile.fsi (5,4--5,13));
+          Else /root/SingleIfElseEndif,SignatureFile.fsi (7,4--7,9);
+          EndIf /root/SingleIfElseEndif,SignatureFile.fsi (9,4--9,10)]
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfElseEndif.fs b/tests/service/data/SyntaxTree/SingleIfElseEndif.fs
index 24d95ae6e12..dc9198f51ea 100644
--- a/tests/service/data/SyntaxTree/SingleIfElseEndif.fs
+++ b/tests/service/data/SyntaxTree/SingleIfElseEndif.fs
@@ -1,6 +1,7 @@
+
 let v =
     #if DEBUG
     30
     #else
     42
-    #endif
\ No newline at end of file
+    #endif
diff --git a/tests/service/data/SyntaxTree/SingleIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/SingleIfElseEndif.fs.bsl
index 749608c7bd1..dff1066ca32 100644
--- a/tests/service/data/SyntaxTree/SingleIfElseEndif.fs.bsl
+++ b/tests/service/data/SyntaxTree/SingleIfElseEndif.fs.bsl
@@ -8,23 +8,23 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (v, None), false, None,
-                     /root/SingleIfElseEndif.fs (1,4--1,5)), None,
-                  Const (Int32 42, /root/SingleIfElseEndif.fs (5,4--5,6)),
-                  /root/SingleIfElseEndif.fs (1,4--1,5),
-                  Yes /root/SingleIfElseEndif.fs (1,0--5,6),
-                  { LeadingKeyword = Let /root/SingleIfElseEndif.fs (1,0--1,3)
+                     /root/SingleIfElseEndif.fs (2,4--2,5)), None,
+                  Const (Int32 42, /root/SingleIfElseEndif.fs (6,4--6,6)),
+                  /root/SingleIfElseEndif.fs (2,4--2,5),
+                  Yes /root/SingleIfElseEndif.fs (2,0--6,6),
+                  { LeadingKeyword = Let /root/SingleIfElseEndif.fs (2,0--2,3)
                     InlineKeyword = None
-                    EqualsRange = Some /root/SingleIfElseEndif.fs (1,6--1,7) })],
-              /root/SingleIfElseEndif.fs (1,0--5,6))], PreXmlDocEmpty, [], None,
-          /root/SingleIfElseEndif.fs (1,0--6,10), { LeadingKeyword = None })],
+                    EqualsRange = Some /root/SingleIfElseEndif.fs (2,6--2,7) })],
+              /root/SingleIfElseEndif.fs (2,0--6,6))], PreXmlDocEmpty, [], None,
+          /root/SingleIfElseEndif.fs (2,0--8,0), { LeadingKeyword = None })],
       (true, false),
       { ConditionalDirectives =
-         [If (Ident "DEBUG", /root/SingleIfElseEndif.fs (2,4--2,13));
-          Else /root/SingleIfElseEndif.fs (4,4--4,9);
-          EndIf /root/SingleIfElseEndif.fs (6,4--6,10)]
+         [If (Ident "DEBUG", /root/SingleIfElseEndif.fs (3,4--3,13));
+          Else /root/SingleIfElseEndif.fs (5,4--5,9);
+          EndIf /root/SingleIfElseEndif.fs (7,4--7,10)]
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi b/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi
index 02acf6b0da2..759d04cc3f6 100644
--- a/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi
+++ b/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi
@@ -1,7 +1,8 @@
+
 namespace Foobar
 
 val v: int =
     #if DEBUG
     1
     #endif
-    42
\ No newline at end of file
+    42
diff --git a/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi.bsl
index b471be5885c..458b0dbfacc 100644
--- a/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi.bsl
@@ -9,23 +9,23 @@ SigFile
                 ([], SynIdent (v, None), SynValTyparDecls (None, true),
                  LongIdent (SynLongIdent ([int], [], [None])),
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
                  Some
                    (Const
                       (Int32 42,
-                       /root/SingleIfEndif,SignatureFile.fsi (7,4--7,6))),
-                 /root/SingleIfEndif,SignatureFile.fsi (3,0--7,6),
+                       /root/SingleIfEndif,SignatureFile.fsi (8,4--8,6))),
+                 /root/SingleIfEndif,SignatureFile.fsi (4,0--8,6),
                  { LeadingKeyword =
-                    Val /root/SingleIfEndif,SignatureFile.fsi (3,0--3,3)
+                    Val /root/SingleIfEndif,SignatureFile.fsi (4,0--4,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange =
-                    Some /root/SingleIfEndif,SignatureFile.fsi (3,11--3,12) }),
-              /root/SingleIfEndif,SignatureFile.fsi (3,0--7,6))], PreXmlDocEmpty,
-          [], None, /root/SingleIfEndif,SignatureFile.fsi (1,0--7,6),
+                    Some /root/SingleIfEndif,SignatureFile.fsi (4,11--4,12) }),
+              /root/SingleIfEndif,SignatureFile.fsi (4,0--8,6))], PreXmlDocEmpty,
+          [], None, /root/SingleIfEndif,SignatureFile.fsi (2,0--8,6),
           { LeadingKeyword =
-             Namespace /root/SingleIfEndif,SignatureFile.fsi (1,0--1,9) })],
+             Namespace /root/SingleIfEndif,SignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives =
-         [If (Ident "DEBUG", /root/SingleIfEndif,SignatureFile.fsi (4,4--4,13));
-          EndIf /root/SingleIfEndif,SignatureFile.fsi (6,4--6,10)]
+         [If (Ident "DEBUG", /root/SingleIfEndif,SignatureFile.fsi (5,4--5,13));
+          EndIf /root/SingleIfEndif,SignatureFile.fsi (7,4--7,10)]
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfEndif.fs b/tests/service/data/SyntaxTree/SingleIfEndif.fs
index 490cff03e02..335320516e6 100644
--- a/tests/service/data/SyntaxTree/SingleIfEndif.fs
+++ b/tests/service/data/SyntaxTree/SingleIfEndif.fs
@@ -1,5 +1,6 @@
+
 let v =
     #if DEBUG
     ()
     #endif
-    42
\ No newline at end of file
+    42
diff --git a/tests/service/data/SyntaxTree/SingleIfEndif.fs.bsl b/tests/service/data/SyntaxTree/SingleIfEndif.fs.bsl
index 30981cadd3b..0bdfc3e9862 100644
--- a/tests/service/data/SyntaxTree/SingleIfEndif.fs.bsl
+++ b/tests/service/data/SyntaxTree/SingleIfEndif.fs.bsl
@@ -7,22 +7,22 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (v, None), false, None,
-                     /root/SingleIfEndif.fs (1,4--1,5)), None,
-                  Const (Int32 42, /root/SingleIfEndif.fs (5,4--5,6)),
-                  /root/SingleIfEndif.fs (1,4--1,5),
-                  Yes /root/SingleIfEndif.fs (1,0--5,6),
-                  { LeadingKeyword = Let /root/SingleIfEndif.fs (1,0--1,3)
+                     /root/SingleIfEndif.fs (2,4--2,5)), None,
+                  Const (Int32 42, /root/SingleIfEndif.fs (6,4--6,6)),
+                  /root/SingleIfEndif.fs (2,4--2,5),
+                  Yes /root/SingleIfEndif.fs (2,0--6,6),
+                  { LeadingKeyword = Let /root/SingleIfEndif.fs (2,0--2,3)
                     InlineKeyword = None
-                    EqualsRange = Some /root/SingleIfEndif.fs (1,6--1,7) })],
-              /root/SingleIfEndif.fs (1,0--5,6))], PreXmlDocEmpty, [], None,
-          /root/SingleIfEndif.fs (1,0--5,6), { LeadingKeyword = None })],
+                    EqualsRange = Some /root/SingleIfEndif.fs (2,6--2,7) })],
+              /root/SingleIfEndif.fs (2,0--6,6))], PreXmlDocEmpty, [], None,
+          /root/SingleIfEndif.fs (2,0--7,0), { LeadingKeyword = None })],
       (true, false),
       { ConditionalDirectives =
-         [If (Ident "DEBUG", /root/SingleIfEndif.fs (2,4--2,13));
-          EndIf /root/SingleIfEndif.fs (4,4--4,10)]
+         [If (Ident "DEBUG", /root/SingleIfEndif.fs (3,4--3,13));
+          EndIf /root/SingleIfEndif.fs (5,4--5,10)]
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs b/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs
index b5070f540e4..c42d58d2017 100644
--- a/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs
+++ b/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs
@@ -1 +1,2 @@
-type Foo = One = 0x00000001
\ No newline at end of file
+
+type Foo = One = 0x00000001
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl b/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
index a75d4046d35..3457e38256a 100644
--- a/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
+++ b/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
@@ -8,35 +8,35 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,5--1,8)),
+                     /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,5--2,8)),
                   Simple
                     (Enum
                        ([SynEnumCase
                            ([], SynIdent (One, None),
                             Const
                               (Int32 1,
-                               /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,17--1,27)),
-                            PreXmlDoc ((1,11), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,11--1,27),
+                               /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,17--2,27)),
+                            PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,11--2,27),
                             { BarRange = None
                               EqualsRange =
-                               /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,15--1,16) })],
-                        /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,11--1,27)),
-                     /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,11--1,27)),
+                               /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,15--2,16) })],
+                        /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,11--2,27)),
+                     /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,11--2,27)),
                   [], None,
-                  /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,5--1,27),
+                  /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,5--2,27),
                   { LeadingKeyword =
                      Type
-                       /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,0--1,4)
+                       /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,9--1,10)
+                       /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,0--1,27))],
+              /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,0--2,27))],
           PreXmlDocEmpty, [], None,
-          /root/SingleSynEnumCaseContainsRangeOfConstant.fs (1,0--1,27),
+          /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs b/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs
index 0047eb6d33c..5fca8272108 100644
--- a/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs
+++ b/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs
@@ -1 +1,2 @@
-type Foo = | Bar = 1
\ No newline at end of file
+
+type Foo = | Bar = 1
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs.bsl b/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs.bsl
index d5c255d05dd..55599128538 100644
--- a/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs.bsl
@@ -8,34 +8,34 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SingleSynEnumCaseHasBarRange.fs (1,5--1,8)),
+                     /root/SingleSynEnumCaseHasBarRange.fs (2,5--2,8)),
                   Simple
                     (Enum
                        ([SynEnumCase
                            ([], SynIdent (Bar, None),
                             Const
                               (Int32 1,
-                               /root/SingleSynEnumCaseHasBarRange.fs (1,19--1,20)),
-                            PreXmlDoc ((1,11), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SingleSynEnumCaseHasBarRange.fs (1,13--1,20),
+                               /root/SingleSynEnumCaseHasBarRange.fs (2,19--2,20)),
+                            PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SingleSynEnumCaseHasBarRange.fs (2,13--2,20),
                             { BarRange =
                                Some
-                                 /root/SingleSynEnumCaseHasBarRange.fs (1,11--1,12)
+                                 /root/SingleSynEnumCaseHasBarRange.fs (2,11--2,12)
                               EqualsRange =
-                               /root/SingleSynEnumCaseHasBarRange.fs (1,17--1,18) })],
-                        /root/SingleSynEnumCaseHasBarRange.fs (1,11--1,20)),
-                     /root/SingleSynEnumCaseHasBarRange.fs (1,11--1,20)), [],
-                  None, /root/SingleSynEnumCaseHasBarRange.fs (1,5--1,20),
+                               /root/SingleSynEnumCaseHasBarRange.fs (2,17--2,18) })],
+                        /root/SingleSynEnumCaseHasBarRange.fs (2,11--2,20)),
+                     /root/SingleSynEnumCaseHasBarRange.fs (2,11--2,20)), [],
+                  None, /root/SingleSynEnumCaseHasBarRange.fs (2,5--2,20),
                   { LeadingKeyword =
-                     Type /root/SingleSynEnumCaseHasBarRange.fs (1,0--1,4)
+                     Type /root/SingleSynEnumCaseHasBarRange.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/SingleSynEnumCaseHasBarRange.fs (1,9--1,10)
+                     Some /root/SingleSynEnumCaseHasBarRange.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SingleSynEnumCaseHasBarRange.fs (1,0--1,20))],
+              /root/SingleSynEnumCaseHasBarRange.fs (2,0--2,20))],
           PreXmlDocEmpty, [], None,
-          /root/SingleSynEnumCaseHasBarRange.fs (1,0--1,20),
+          /root/SingleSynEnumCaseHasBarRange.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs b/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs
index 2fee6037eac..103e7bd46a5 100644
--- a/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs
+++ b/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs
@@ -1 +1,2 @@
-type Foo = Bar = 1
\ No newline at end of file
+
+type Foo = Bar = 1
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs.bsl b/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs.bsl
index 2be912218ad..38b5d31fce3 100644
--- a/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs.bsl
+++ b/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs.bsl
@@ -8,31 +8,31 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SingleSynEnumCaseWithoutBar.fs (1,5--1,8)),
+                     /root/SingleSynEnumCaseWithoutBar.fs (2,5--2,8)),
                   Simple
                     (Enum
                        ([SynEnumCase
                            ([], SynIdent (Bar, None),
                             Const
                               (Int32 1,
-                               /root/SingleSynEnumCaseWithoutBar.fs (1,17--1,18)),
-                            PreXmlDoc ((1,11), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SingleSynEnumCaseWithoutBar.fs (1,11--1,18),
+                               /root/SingleSynEnumCaseWithoutBar.fs (2,17--2,18)),
+                            PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SingleSynEnumCaseWithoutBar.fs (2,11--2,18),
                             { BarRange = None
                               EqualsRange =
-                               /root/SingleSynEnumCaseWithoutBar.fs (1,15--1,16) })],
-                        /root/SingleSynEnumCaseWithoutBar.fs (1,11--1,18)),
-                     /root/SingleSynEnumCaseWithoutBar.fs (1,11--1,18)), [],
-                  None, /root/SingleSynEnumCaseWithoutBar.fs (1,5--1,18),
+                               /root/SingleSynEnumCaseWithoutBar.fs (2,15--2,16) })],
+                        /root/SingleSynEnumCaseWithoutBar.fs (2,11--2,18)),
+                     /root/SingleSynEnumCaseWithoutBar.fs (2,11--2,18)), [],
+                  None, /root/SingleSynEnumCaseWithoutBar.fs (2,5--2,18),
                   { LeadingKeyword =
-                     Type /root/SingleSynEnumCaseWithoutBar.fs (1,0--1,4)
+                     Type /root/SingleSynEnumCaseWithoutBar.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/SingleSynEnumCaseWithoutBar.fs (1,9--1,10)
+                     Some /root/SingleSynEnumCaseWithoutBar.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SingleSynEnumCaseWithoutBar.fs (1,0--1,18))], PreXmlDocEmpty,
-          [], None, /root/SingleSynEnumCaseWithoutBar.fs (1,0--1,18),
+              /root/SingleSynEnumCaseWithoutBar.fs (2,0--2,18))], PreXmlDocEmpty,
+          [], None, /root/SingleSynEnumCaseWithoutBar.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs b/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs
index cad53954b25..04baf49fda6 100644
--- a/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs
+++ b/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs
@@ -1,3 +1,4 @@
+
 type X =
     static member inline replace< ^a, ^b, ^c when ^b: (static member replace: ^a * ^b -> ^c)>(a: ^a, f: ^b) =
-        (^b : (static member replace: ^a * ^b -> ^c) (a, f))
\ No newline at end of file
+        (^b : (static member replace: ^a * ^b -> ^c) (a, f))
diff --git a/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs.bsl
index 86f1bcafbb5..e8d722ae8f6 100644
--- a/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs.bsl
+++ b/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs.bsl
@@ -8,15 +8,15 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SingleSynTypeInsideSynExprTraitCall.fs (1,5--1,6)),
+                     /root/SingleSynTypeInsideSynExprTraitCall.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
                         (SynBinding
                            (None, Normal, true, false, [],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = false
                                       IsDispatchSlot = false
@@ -43,7 +43,7 @@ ImplFile
                                            [WhereTyparSupportsMember
                                               (Var
                                                  (SynTypar (b, HeadType, false),
-                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (2,50--2,52)),
+                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (3,50--3,52)),
                                                Member
                                                  (SynValSig
                                                     ([],
@@ -58,23 +58,23 @@ ImplFile
                                                                  (SynTypar
                                                                     (a, HeadType,
                                                                      false),
-                                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (2,78--2,80)));
+                                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (3,78--3,80)));
                                                             Star
-                                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (2,81--2,82);
+                                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (3,81--3,82);
                                                             Type
                                                               (Var
                                                                  (SynTypar
                                                                     (b, HeadType,
                                                                      false),
-                                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (2,83--2,85)))],
-                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (2,78--2,85)),
+                                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (3,83--3,85)))],
+                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (3,78--3,85)),
                                                         Var
                                                           (SynTypar
                                                              (c, HeadType, false),
-                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (2,89--2,91)),
-                                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (2,78--2,91),
+                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (3,89--3,91)),
+                                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (3,78--3,91),
                                                         { ArrowRange =
-                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (2,86--2,88) }),
+                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (3,86--3,88) }),
                                                      SynValInfo
                                                        ([[SynArgInfo
                                                             ([], false, None);
@@ -83,13 +83,13 @@ ImplFile
                                                         SynArgInfo
                                                           ([], false, None)),
                                                      false, false,
-                                                     PreXmlDoc ((2,55), FSharp.Compiler.Xml.XmlDocCollector),
+                                                     PreXmlDoc ((3,55), FSharp.Compiler.Xml.XmlDocCollector),
                                                      None, None,
-                                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (2,55--2,91),
+                                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,55--3,91),
                                                      { LeadingKeyword =
                                                         StaticMember
-                                                          (/root/SingleSynTypeInsideSynExprTraitCall.fs (2,55--2,61),
-                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (2,62--2,68))
+                                                          (/root/SingleSynTypeInsideSynExprTraitCall.fs (3,55--3,61),
+                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (3,62--3,68))
                                                        InlineKeyword = None
                                                        WithKeyword = None
                                                        EqualsRange = None }),
@@ -101,10 +101,10 @@ ImplFile
                                                     GetterOrSetterIsCompilerGenerated =
                                                      false
                                                     MemberKind = Member },
-                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (2,55--2,91),
+                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (3,55--3,91),
                                                   { GetSetKeywords = None }),
-                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (2,50--2,92))],
-                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (2,32--2,93))),
+                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,50--3,92))],
+                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (3,32--3,93))),
                                      false)),
                                Pats
                                  [Paren
@@ -113,29 +113,29 @@ ImplFile
                                         [Typed
                                            (Named
                                               (SynIdent (a, None), false, None,
-                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (2,94--2,95)),
+                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,94--3,95)),
                                             Var
                                               (SynTypar (a, HeadType, false),
-                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (2,97--2,99)),
-                                            /root/SingleSynTypeInsideSynExprTraitCall.fs (2,94--2,99));
+                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,97--3,99)),
+                                            /root/SingleSynTypeInsideSynExprTraitCall.fs (3,94--3,99));
                                          Typed
                                            (Named
                                               (SynIdent (f, None), false, None,
-                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (2,101--2,102)),
+                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,101--3,102)),
                                             Var
                                               (SynTypar (b, HeadType, false),
-                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (2,104--2,106)),
-                                            /root/SingleSynTypeInsideSynExprTraitCall.fs (2,101--2,106))],
-                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (2,94--2,106)),
-                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (2,93--2,107))],
+                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,104--3,106)),
+                                            /root/SingleSynTypeInsideSynExprTraitCall.fs (3,101--3,106))],
+                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (3,94--3,106)),
+                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,93--3,107))],
                                None,
-                               /root/SingleSynTypeInsideSynExprTraitCall.fs (2,25--2,107)),
+                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,25--3,107)),
                             None,
                             Paren
                               (TraitCall
                                  (Var
                                     (SynTypar (b, HeadType, false),
-                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,9--3,11)),
+                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (4,9--4,11)),
                                   Member
                                     (SynValSig
                                        ([], SynIdent (replace, None),
@@ -147,33 +147,33 @@ ImplFile
                                                  (Var
                                                     (SynTypar
                                                        (a, HeadType, false),
-                                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,38--3,40)));
+                                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (4,38--4,40)));
                                                Star
-                                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (3,41--3,42);
+                                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (4,41--4,42);
                                                Type
                                                  (Var
                                                     (SynTypar
                                                        (b, HeadType, false),
-                                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,43--3,45)))],
-                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (3,38--3,45)),
+                                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (4,43--4,45)))],
+                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (4,38--4,45)),
                                            Var
                                              (SynTypar (c, HeadType, false),
-                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (3,49--3,51)),
-                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (3,38--3,51),
+                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (4,49--4,51)),
+                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (4,38--4,51),
                                            { ArrowRange =
-                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (3,46--3,48) }),
+                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (4,46--4,48) }),
                                         SynValInfo
                                           ([[SynArgInfo ([], false, None);
                                              SynArgInfo ([], false, None)]],
                                            SynArgInfo ([], false, None)), false,
                                         false,
-                                        PreXmlDoc ((3,15), FSharp.Compiler.Xml.XmlDocCollector),
+                                        PreXmlDoc ((4,15), FSharp.Compiler.Xml.XmlDocCollector),
                                         None, None,
-                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (3,15--3,51),
+                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (4,15--4,51),
                                         { LeadingKeyword =
                                            StaticMember
-                                             (/root/SingleSynTypeInsideSynExprTraitCall.fs (3,15--3,21),
-                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (3,22--3,28))
+                                             (/root/SingleSynTypeInsideSynExprTraitCall.fs (4,15--4,21),
+                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (4,22--4,28))
                                           InlineKeyword = None
                                           WithKeyword = None
                                           EqualsRange = None }),
@@ -183,48 +183,48 @@ ImplFile
                                        IsFinal = false
                                        GetterOrSetterIsCompilerGenerated = false
                                        MemberKind = Member },
-                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,15--3,51),
+                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (4,15--4,51),
                                      { GetSetKeywords = None }),
                                   Paren
                                     (Tuple
                                        (false, [Ident a; Ident f],
-                                        [/root/SingleSynTypeInsideSynExprTraitCall.fs (3,55--3,56)],
-                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (3,54--3,58)),
-                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,53--3,54),
+                                        [/root/SingleSynTypeInsideSynExprTraitCall.fs (4,55--4,56)],
+                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (4,54--4,58)),
+                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (4,53--4,54),
                                      Some
-                                       /root/SingleSynTypeInsideSynExprTraitCall.fs (3,58--3,59),
-                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,53--3,59)),
-                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (3,8--3,60)),
-                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,8--3,9),
+                                       /root/SingleSynTypeInsideSynExprTraitCall.fs (4,58--4,59),
+                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (4,53--4,59)),
+                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (4,8--4,60)),
+                               /root/SingleSynTypeInsideSynExprTraitCall.fs (4,8--4,9),
                                Some
-                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (3,59--3,60),
-                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,8--3,60)),
-                            /root/SingleSynTypeInsideSynExprTraitCall.fs (2,25--2,107),
+                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (4,59--4,60),
+                               /root/SingleSynTypeInsideSynExprTraitCall.fs (4,8--4,60)),
+                            /root/SingleSynTypeInsideSynExprTraitCall.fs (3,25--3,107),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                StaticMember
-                                 (/root/SingleSynTypeInsideSynExprTraitCall.fs (2,4--2,10),
-                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (2,11--2,17))
+                                 (/root/SingleSynTypeInsideSynExprTraitCall.fs (3,4--3,10),
+                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (3,11--3,17))
                               InlineKeyword =
                                Some
-                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (2,18--2,24)
+                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (3,18--3,24)
                               EqualsRange =
                                Some
-                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (2,108--2,109) }),
-                         /root/SingleSynTypeInsideSynExprTraitCall.fs (2,4--3,60))],
-                     /root/SingleSynTypeInsideSynExprTraitCall.fs (2,4--3,60)),
+                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (3,108--3,109) }),
+                         /root/SingleSynTypeInsideSynExprTraitCall.fs (3,4--4,60))],
+                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,4--4,60)),
                   [], None,
-                  /root/SingleSynTypeInsideSynExprTraitCall.fs (1,5--3,60),
+                  /root/SingleSynTypeInsideSynExprTraitCall.fs (2,5--4,60),
                   { LeadingKeyword =
                      Type
-                       /root/SingleSynTypeInsideSynExprTraitCall.fs (1,0--1,4)
+                       /root/SingleSynTypeInsideSynExprTraitCall.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SingleSynTypeInsideSynExprTraitCall.fs (1,7--1,8)
+                       /root/SingleSynTypeInsideSynExprTraitCall.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/SingleSynTypeInsideSynExprTraitCall.fs (1,0--3,60))],
+              /root/SingleSynTypeInsideSynExprTraitCall.fs (2,0--4,60))],
           PreXmlDocEmpty, [], None,
-          /root/SingleSynTypeInsideSynExprTraitCall.fs (1,0--3,60),
+          /root/SingleSynTypeInsideSynExprTraitCall.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs b/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs
index 55f8a3064d5..0d6bcfb7afa 100644
--- a/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs
+++ b/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs
@@ -1 +1,2 @@
-type Foo = | Bar of string
\ No newline at end of file
+
+type Foo = | Bar of string
diff --git a/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs.bsl b/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs.bsl
index 42e21f7b550..bbeedf2626a 100644
--- a/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SingleSynUnionCaseHasBarRange.fs (1,5--1,8)),
+                     /root/SingleSynUnionCaseHasBarRange.fs (2,5--2,8)),
                   Simple
                     (Union
                        (None,
@@ -21,27 +21,27 @@ ImplFile
                                  ([], false, None,
                                   LongIdent
                                     (SynLongIdent ([string], [], [None])), false,
-                                  PreXmlDoc ((1,20), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((2,20), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SingleSynUnionCaseHasBarRange.fs (1,20--1,26),
+                                  /root/SingleSynUnionCaseHasBarRange.fs (2,20--2,26),
                                   { LeadingKeyword = None })],
-                            PreXmlDoc ((1,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SingleSynUnionCaseHasBarRange.fs (1,13--1,26),
+                            /root/SingleSynUnionCaseHasBarRange.fs (2,13--2,26),
                             { BarRange =
                                Some
-                                 /root/SingleSynUnionCaseHasBarRange.fs (1,11--1,12) })],
-                        /root/SingleSynUnionCaseHasBarRange.fs (1,11--1,26)),
-                     /root/SingleSynUnionCaseHasBarRange.fs (1,11--1,26)), [],
-                  None, /root/SingleSynUnionCaseHasBarRange.fs (1,5--1,26),
+                                 /root/SingleSynUnionCaseHasBarRange.fs (2,11--2,12) })],
+                        /root/SingleSynUnionCaseHasBarRange.fs (2,11--2,26)),
+                     /root/SingleSynUnionCaseHasBarRange.fs (2,11--2,26)), [],
+                  None, /root/SingleSynUnionCaseHasBarRange.fs (2,5--2,26),
                   { LeadingKeyword =
-                     Type /root/SingleSynUnionCaseHasBarRange.fs (1,0--1,4)
+                     Type /root/SingleSynUnionCaseHasBarRange.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/SingleSynUnionCaseHasBarRange.fs (1,9--1,10)
+                     Some /root/SingleSynUnionCaseHasBarRange.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SingleSynUnionCaseHasBarRange.fs (1,0--1,26))],
+              /root/SingleSynUnionCaseHasBarRange.fs (2,0--2,26))],
           PreXmlDocEmpty, [], None,
-          /root/SingleSynUnionCaseHasBarRange.fs (1,0--1,26),
+          /root/SingleSynUnionCaseHasBarRange.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs b/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs
index 0beec8a1a9c..1b6f0c7a0f1 100644
--- a/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs
+++ b/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs
@@ -1 +1,2 @@
-type Foo = Bar of string
\ No newline at end of file
+
+type Foo = Bar of string
diff --git a/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs.bsl b/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs.bsl
index 6f494ba1ab0..8cf71d67857 100644
--- a/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs.bsl
+++ b/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SingleSynUnionCaseWithoutBar.fs (1,5--1,8)),
+                     /root/SingleSynUnionCaseWithoutBar.fs (2,5--2,8)),
                   Simple
                     (Union
                        (None,
@@ -21,25 +21,25 @@ ImplFile
                                  ([], false, None,
                                   LongIdent
                                     (SynLongIdent ([string], [], [None])), false,
-                                  PreXmlDoc ((1,18), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((2,18), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SingleSynUnionCaseWithoutBar.fs (1,18--1,24),
+                                  /root/SingleSynUnionCaseWithoutBar.fs (2,18--2,24),
                                   { LeadingKeyword = None })],
-                            PreXmlDoc ((1,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SingleSynUnionCaseWithoutBar.fs (1,11--1,24),
+                            /root/SingleSynUnionCaseWithoutBar.fs (2,11--2,24),
                             { BarRange = None })],
-                        /root/SingleSynUnionCaseWithoutBar.fs (1,11--1,24)),
-                     /root/SingleSynUnionCaseWithoutBar.fs (1,11--1,24)), [],
-                  None, /root/SingleSynUnionCaseWithoutBar.fs (1,5--1,24),
+                        /root/SingleSynUnionCaseWithoutBar.fs (2,11--2,24)),
+                     /root/SingleSynUnionCaseWithoutBar.fs (2,11--2,24)), [],
+                  None, /root/SingleSynUnionCaseWithoutBar.fs (2,5--2,24),
                   { LeadingKeyword =
-                     Type /root/SingleSynUnionCaseWithoutBar.fs (1,0--1,4)
+                     Type /root/SingleSynUnionCaseWithoutBar.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/SingleSynUnionCaseWithoutBar.fs (1,9--1,10)
+                     Some /root/SingleSynUnionCaseWithoutBar.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SingleSynUnionCaseWithoutBar.fs (1,0--1,24))],
+              /root/SingleSynUnionCaseWithoutBar.fs (2,0--2,24))],
           PreXmlDocEmpty, [], None,
-          /root/SingleSynUnionCaseWithoutBar.fs (1,0--1,24),
+          /root/SingleSynUnionCaseWithoutBar.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs b/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs
index c2e4c619c80..d29dbba12d5 100644
--- a/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs
+++ b/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs
@@ -1 +1,2 @@
-#I __SOURCE_DIRECTORY__
\ No newline at end of file
+
+#I __SOURCE_DIRECTORY__
diff --git a/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
index d83a067d86e..31bbd6ef8bc 100644
--- a/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
+++ b/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
@@ -9,11 +9,11 @@ ImplFile
                 ("I",
                  [SourceIdentifier
                     ("__SOURCE_DIRECTORY__", "C:\root",
-                     /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (1,3--1,23))],
-                 /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (1,0--1,23)),
-              /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (1,0--1,23))],
+                     /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,3--2,23))],
+                 /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23)),
+              /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23))],
           PreXmlDocEmpty, [], None,
-          /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (1,0--1,23),
+          /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs b/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs
index 9f56cd3366e..2571b09392d 100644
--- a/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs
+++ b/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    static abstract Y : int -> int
\ No newline at end of file
+    static abstract Y : int -> int
diff --git a/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs.bsl
index 0bd2e0183d2..253dd755122 100644
--- a/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs.bsl
@@ -8,8 +8,8 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/StaticAbstractKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/StaticAbstractKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AbstractSlot
@@ -19,19 +19,19 @@ ImplFile
                             Fun
                               (LongIdent (SynLongIdent ([int], [], [None])),
                                LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/StaticAbstractKeyword.fs (2,24--2,34),
+                               /root/StaticAbstractKeyword.fs (3,24--3,34),
                                { ArrowRange =
-                                  /root/StaticAbstractKeyword.fs (2,28--2,30) }),
+                                  /root/StaticAbstractKeyword.fs (3,28--3,30) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]],
                                SynArgInfo ([], false, None)), false, false,
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/StaticAbstractKeyword.fs (2,4--2,34),
+                            /root/StaticAbstractKeyword.fs (3,4--3,34),
                             { LeadingKeyword =
                                StaticAbstract
-                                 (/root/StaticAbstractKeyword.fs (2,4--2,10),
-                                  /root/StaticAbstractKeyword.fs (2,11--2,19))
+                                 (/root/StaticAbstractKeyword.fs (3,4--3,10),
+                                  /root/StaticAbstractKeyword.fs (3,11--3,19))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -41,16 +41,16 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/StaticAbstractKeyword.fs (2,4--2,34),
+                         /root/StaticAbstractKeyword.fs (3,4--3,34),
                          { GetSetKeywords = None })],
-                     /root/StaticAbstractKeyword.fs (2,4--2,34)), [], None,
-                  /root/StaticAbstractKeyword.fs (1,5--2,34),
+                     /root/StaticAbstractKeyword.fs (3,4--3,34)), [], None,
+                  /root/StaticAbstractKeyword.fs (2,5--3,34),
                   { LeadingKeyword =
-                     Type /root/StaticAbstractKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/StaticAbstractKeyword.fs (1,7--1,8)
+                     Type /root/StaticAbstractKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/StaticAbstractKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/StaticAbstractKeyword.fs (1,0--2,34))], PreXmlDocEmpty, [],
-          None, /root/StaticAbstractKeyword.fs (1,0--2,34),
+              /root/StaticAbstractKeyword.fs (2,0--3,34))], PreXmlDocEmpty, [],
+          None, /root/StaticAbstractKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs b/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs
index 8428cb9b5f7..3931558ca1f 100644
--- a/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs
+++ b/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    static abstract member Y : int -> int
\ No newline at end of file
+    static abstract member Y : int -> int
diff --git a/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs.bsl
index e649408227b..02a8fab44db 100644
--- a/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/StaticAbstractMemberKeyword.fs (1,5--1,6)),
+                     /root/StaticAbstractMemberKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AbstractSlot
@@ -20,20 +20,20 @@ ImplFile
                             Fun
                               (LongIdent (SynLongIdent ([int], [], [None])),
                                LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/StaticAbstractMemberKeyword.fs (2,31--2,41),
+                               /root/StaticAbstractMemberKeyword.fs (3,31--3,41),
                                { ArrowRange =
-                                  /root/StaticAbstractMemberKeyword.fs (2,35--2,37) }),
+                                  /root/StaticAbstractMemberKeyword.fs (3,35--3,37) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]],
                                SynArgInfo ([], false, None)), false, false,
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/StaticAbstractMemberKeyword.fs (2,4--2,41),
+                            /root/StaticAbstractMemberKeyword.fs (3,4--3,41),
                             { LeadingKeyword =
                                StaticAbstractMember
-                                 (/root/StaticAbstractMemberKeyword.fs (2,4--2,10),
-                                  /root/StaticAbstractMemberKeyword.fs (2,11--2,19),
-                                  /root/StaticAbstractMemberKeyword.fs (2,20--2,26))
+                                 (/root/StaticAbstractMemberKeyword.fs (3,4--3,10),
+                                  /root/StaticAbstractMemberKeyword.fs (3,11--3,19),
+                                  /root/StaticAbstractMemberKeyword.fs (3,20--3,26))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -43,17 +43,17 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/StaticAbstractMemberKeyword.fs (2,4--2,41),
+                         /root/StaticAbstractMemberKeyword.fs (3,4--3,41),
                          { GetSetKeywords = None })],
-                     /root/StaticAbstractMemberKeyword.fs (2,4--2,41)), [], None,
-                  /root/StaticAbstractMemberKeyword.fs (1,5--2,41),
+                     /root/StaticAbstractMemberKeyword.fs (3,4--3,41)), [], None,
+                  /root/StaticAbstractMemberKeyword.fs (2,5--3,41),
                   { LeadingKeyword =
-                     Type /root/StaticAbstractMemberKeyword.fs (1,0--1,4)
+                     Type /root/StaticAbstractMemberKeyword.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/StaticAbstractMemberKeyword.fs (1,7--1,8)
+                     Some /root/StaticAbstractMemberKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/StaticAbstractMemberKeyword.fs (1,0--2,41))], PreXmlDocEmpty,
-          [], None, /root/StaticAbstractMemberKeyword.fs (1,0--2,41),
+              /root/StaticAbstractMemberKeyword.fs (2,0--3,41))], PreXmlDocEmpty,
+          [], None, /root/StaticAbstractMemberKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticLetKeyword.fs b/tests/service/data/SyntaxTree/StaticLetKeyword.fs
index 0f32265ec37..18c537277e0 100644
--- a/tests/service/data/SyntaxTree/StaticLetKeyword.fs
+++ b/tests/service/data/SyntaxTree/StaticLetKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    static let PI = 3.14
\ No newline at end of file
+    static let PI = 3.14
diff --git a/tests/service/data/SyntaxTree/StaticLetKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticLetKeyword.fs.bsl
index 12129e29fc3..b12b590146e 100644
--- a/tests/service/data/SyntaxTree/StaticLetKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/StaticLetKeyword.fs.bsl
@@ -8,14 +8,14 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/StaticLetKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/StaticLetKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [LetBindings
                         ([SynBinding
                             (None, Normal, false, false, [],
-                             PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
@@ -23,26 +23,26 @@ ImplFile
                              LongIdent
                                (SynLongIdent ([PI], [], [None]), None, None,
                                 Pats [], None,
-                                /root/StaticLetKeyword.fs (2,15--2,17)), None,
+                                /root/StaticLetKeyword.fs (3,15--3,17)), None,
                              Const
                                (Double 3.14,
-                                /root/StaticLetKeyword.fs (2,20--2,24)),
-                             /root/StaticLetKeyword.fs (2,15--2,17),
-                             Yes /root/StaticLetKeyword.fs (2,11--2,24),
+                                /root/StaticLetKeyword.fs (3,20--3,24)),
+                             /root/StaticLetKeyword.fs (3,15--3,17),
+                             Yes /root/StaticLetKeyword.fs (3,11--3,24),
                              { LeadingKeyword =
                                 StaticLet
-                                  (/root/StaticLetKeyword.fs (2,4--2,10),
-                                   /root/StaticLetKeyword.fs (2,11--2,14))
+                                  (/root/StaticLetKeyword.fs (3,4--3,10),
+                                   /root/StaticLetKeyword.fs (3,11--3,14))
                                InlineKeyword = None
                                EqualsRange =
-                                Some /root/StaticLetKeyword.fs (2,18--2,19) })],
-                         true, false, /root/StaticLetKeyword.fs (2,4--2,24))],
-                     /root/StaticLetKeyword.fs (2,4--2,24)), [], None,
-                  /root/StaticLetKeyword.fs (1,5--2,24),
-                  { LeadingKeyword = Type /root/StaticLetKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/StaticLetKeyword.fs (1,7--1,8)
+                                Some /root/StaticLetKeyword.fs (3,18--3,19) })],
+                         true, false, /root/StaticLetKeyword.fs (3,4--3,24))],
+                     /root/StaticLetKeyword.fs (3,4--3,24)), [], None,
+                  /root/StaticLetKeyword.fs (2,5--3,24),
+                  { LeadingKeyword = Type /root/StaticLetKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/StaticLetKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/StaticLetKeyword.fs (1,0--2,24))], PreXmlDocEmpty, [], None,
-          /root/StaticLetKeyword.fs (1,0--2,24), { LeadingKeyword = None })],
+              /root/StaticLetKeyword.fs (2,0--3,24))], PreXmlDocEmpty, [], None,
+          /root/StaticLetKeyword.fs (2,0--4,0), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs b/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs
index dec32e2d3b2..41e13890713 100644
--- a/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs
+++ b/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    static let rec forever () = forever()
\ No newline at end of file
+    static let rec forever () = forever()
diff --git a/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs.bsl
index 42299a38387..ca27758c4a3 100644
--- a/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs.bsl
@@ -8,14 +8,14 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/StaticLetRecKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/StaticLetRecKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [LetBindings
                         ([SynBinding
                             (None, Normal, false, false, [],
-                             PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                              SynValData
                                (None,
                                 SynValInfo ([[]], SynArgInfo ([], false, None)),
@@ -26,35 +26,35 @@ ImplFile
                                   [Paren
                                      (Const
                                         (Unit,
-                                         /root/StaticLetRecKeyword.fs (2,27--2,29)),
-                                      /root/StaticLetRecKeyword.fs (2,27--2,29))],
-                                None, /root/StaticLetRecKeyword.fs (2,19--2,29)),
+                                         /root/StaticLetRecKeyword.fs (3,27--3,29)),
+                                      /root/StaticLetRecKeyword.fs (3,27--3,29))],
+                                None, /root/StaticLetRecKeyword.fs (3,19--3,29)),
                              None,
                              App
                                (Atomic, false, Ident forever,
                                 Const
                                   (Unit,
-                                   /root/StaticLetRecKeyword.fs (2,39--2,41)),
-                                /root/StaticLetRecKeyword.fs (2,32--2,41)),
-                             /root/StaticLetRecKeyword.fs (2,19--2,29),
+                                   /root/StaticLetRecKeyword.fs (3,39--3,41)),
+                                /root/StaticLetRecKeyword.fs (3,32--3,41)),
+                             /root/StaticLetRecKeyword.fs (3,19--3,29),
                              NoneAtLet,
                              { LeadingKeyword =
                                 StaticLetRec
-                                  (/root/StaticLetRecKeyword.fs (2,4--2,10),
-                                   /root/StaticLetRecKeyword.fs (2,11--2,14),
-                                   /root/StaticLetRecKeyword.fs (2,15--2,18))
+                                  (/root/StaticLetRecKeyword.fs (3,4--3,10),
+                                   /root/StaticLetRecKeyword.fs (3,11--3,14),
+                                   /root/StaticLetRecKeyword.fs (3,15--3,18))
                                InlineKeyword = None
                                EqualsRange =
-                                Some /root/StaticLetRecKeyword.fs (2,30--2,31) })],
-                         true, true, /root/StaticLetRecKeyword.fs (2,4--2,41))],
-                     /root/StaticLetRecKeyword.fs (2,4--2,41)), [], None,
-                  /root/StaticLetRecKeyword.fs (1,5--2,41),
+                                Some /root/StaticLetRecKeyword.fs (3,30--3,31) })],
+                         true, true, /root/StaticLetRecKeyword.fs (3,4--3,41))],
+                     /root/StaticLetRecKeyword.fs (3,4--3,41)), [], None,
+                  /root/StaticLetRecKeyword.fs (2,5--3,41),
                   { LeadingKeyword =
-                     Type /root/StaticLetRecKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/StaticLetRecKeyword.fs (1,7--1,8)
+                     Type /root/StaticLetRecKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/StaticLetRecKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/StaticLetRecKeyword.fs (1,0--2,41))], PreXmlDocEmpty, [],
-          None, /root/StaticLetRecKeyword.fs (1,0--2,41),
+              /root/StaticLetRecKeyword.fs (2,0--3,41))], PreXmlDocEmpty, [],
+          None, /root/StaticLetRecKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticMemberKeyword.fs b/tests/service/data/SyntaxTree/StaticMemberKeyword.fs
index 49e7d9cfd7d..7e4ad73e7c0 100644
--- a/tests/service/data/SyntaxTree/StaticMemberKeyword.fs
+++ b/tests/service/data/SyntaxTree/StaticMemberKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    static member Y : int = 1
\ No newline at end of file
+    static member Y : int = 1
diff --git a/tests/service/data/SyntaxTree/StaticMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticMemberKeyword.fs.bsl
index afa710dc3d4..6113fa54693 100644
--- a/tests/service/data/SyntaxTree/StaticMemberKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/StaticMemberKeyword.fs.bsl
@@ -8,14 +8,14 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/StaticMemberKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/StaticMemberKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = false
                                       IsDispatchSlot = false
@@ -28,38 +28,38 @@ ImplFile
                             LongIdent
                               (SynLongIdent ([Y], [], [None]), None, None,
                                Pats [], None,
-                               /root/StaticMemberKeyword.fs (2,18--2,19)),
+                               /root/StaticMemberKeyword.fs (3,18--3,19)),
                             Some
                               (SynBindingReturnInfo
                                  (LongIdent (SynLongIdent ([int], [], [None])),
-                                  /root/StaticMemberKeyword.fs (2,22--2,25), [],
+                                  /root/StaticMemberKeyword.fs (3,22--3,25), [],
                                   { ColonRange =
                                      Some
-                                       /root/StaticMemberKeyword.fs (2,20--2,21) })),
+                                       /root/StaticMemberKeyword.fs (3,20--3,21) })),
                             Typed
                               (Const
                                  (Int32 1,
-                                  /root/StaticMemberKeyword.fs (2,28--2,29)),
+                                  /root/StaticMemberKeyword.fs (3,28--3,29)),
                                LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/StaticMemberKeyword.fs (2,28--2,29)),
-                            /root/StaticMemberKeyword.fs (2,18--2,19),
+                               /root/StaticMemberKeyword.fs (3,28--3,29)),
+                            /root/StaticMemberKeyword.fs (3,18--3,19),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                StaticMember
-                                 (/root/StaticMemberKeyword.fs (2,4--2,10),
-                                  /root/StaticMemberKeyword.fs (2,11--2,17))
+                                 (/root/StaticMemberKeyword.fs (3,4--3,10),
+                                  /root/StaticMemberKeyword.fs (3,11--3,17))
                               InlineKeyword = None
                               EqualsRange =
-                               Some /root/StaticMemberKeyword.fs (2,26--2,27) }),
-                         /root/StaticMemberKeyword.fs (2,4--2,29))],
-                     /root/StaticMemberKeyword.fs (2,4--2,29)), [], None,
-                  /root/StaticMemberKeyword.fs (1,5--2,29),
+                               Some /root/StaticMemberKeyword.fs (3,26--3,27) }),
+                         /root/StaticMemberKeyword.fs (3,4--3,29))],
+                     /root/StaticMemberKeyword.fs (3,4--3,29)), [], None,
+                  /root/StaticMemberKeyword.fs (2,5--3,29),
                   { LeadingKeyword =
-                     Type /root/StaticMemberKeyword.fs (1,0--1,4)
-                    EqualsRange = Some /root/StaticMemberKeyword.fs (1,7--1,8)
+                     Type /root/StaticMemberKeyword.fs (2,0--2,4)
+                    EqualsRange = Some /root/StaticMemberKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/StaticMemberKeyword.fs (1,0--2,29))], PreXmlDocEmpty, [],
-          None, /root/StaticMemberKeyword.fs (1,0--2,29),
+              /root/StaticMemberKeyword.fs (2,0--3,29))], PreXmlDocEmpty, [],
+          None, /root/StaticMemberKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs b/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs
index 3e8ae45a284..13b671fb5ea 100644
--- a/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs
+++ b/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs
@@ -1,2 +1,3 @@
+
 type X =
-    static member val Y : int = 1
\ No newline at end of file
+    static member val Y : int = 1
diff --git a/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs.bsl
index 8379f47211a..1c31254e31e 100644
--- a/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs.bsl
@@ -8,8 +8,8 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/StaticMemberValKeyword.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/StaticMemberValKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AutoProperty
@@ -27,30 +27,30 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None,
                          Const
                            (Int32 1,
-                            /root/StaticMemberValKeyword.fs (2,32--2,33)),
-                         /root/StaticMemberValKeyword.fs (2,4--2,33),
+                            /root/StaticMemberValKeyword.fs (3,32--3,33)),
+                         /root/StaticMemberValKeyword.fs (3,4--3,33),
                          { LeadingKeyword =
                             StaticMemberVal
-                              (/root/StaticMemberValKeyword.fs (2,4--2,10),
-                               /root/StaticMemberValKeyword.fs (2,11--2,17),
-                               /root/StaticMemberValKeyword.fs (2,18--2,21))
+                              (/root/StaticMemberValKeyword.fs (3,4--3,10),
+                               /root/StaticMemberValKeyword.fs (3,11--3,17),
+                               /root/StaticMemberValKeyword.fs (3,18--3,21))
                            WithKeyword = None
                            EqualsRange =
-                            Some /root/StaticMemberValKeyword.fs (2,30--2,31)
+                            Some /root/StaticMemberValKeyword.fs (3,30--3,31)
                            GetSetKeywords = None })],
-                     /root/StaticMemberValKeyword.fs (2,4--2,33)), [], None,
-                  /root/StaticMemberValKeyword.fs (1,5--2,33),
+                     /root/StaticMemberValKeyword.fs (3,4--3,33)), [], None,
+                  /root/StaticMemberValKeyword.fs (2,5--3,33),
                   { LeadingKeyword =
-                     Type /root/StaticMemberValKeyword.fs (1,0--1,4)
+                     Type /root/StaticMemberValKeyword.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/StaticMemberValKeyword.fs (1,7--1,8)
+                     Some /root/StaticMemberValKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/StaticMemberValKeyword.fs (1,0--2,33))], PreXmlDocEmpty, [],
-          None, /root/StaticMemberValKeyword.fs (1,0--2,33),
+              /root/StaticMemberValKeyword.fs (2,0--3,33))], PreXmlDocEmpty, [],
+          None, /root/StaticMemberValKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticValKeyword.fsi b/tests/service/data/SyntaxTree/StaticValKeyword.fsi
index d43a501af5f..fda6848e2e5 100644
--- a/tests/service/data/SyntaxTree/StaticValKeyword.fsi
+++ b/tests/service/data/SyntaxTree/StaticValKeyword.fsi
@@ -1,4 +1,5 @@
+
 namespace Meh
 
 type X =
-    static val Y : int -> int
\ No newline at end of file
+    static val Y : int -> int
diff --git a/tests/service/data/SyntaxTree/StaticValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/StaticValKeyword.fsi.bsl
index dffbbab519c..26804fb80d6 100644
--- a/tests/service/data/SyntaxTree/StaticValKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/StaticValKeyword.fsi.bsl
@@ -7,8 +7,8 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/StaticValKeyword.fsi (3,5--3,6)),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/StaticValKeyword.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [ValField
@@ -17,25 +17,25 @@ SigFile
                             Fun
                               (LongIdent (SynLongIdent ([int], [], [None])),
                                LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/StaticValKeyword.fsi (4,19--4,29),
+                               /root/StaticValKeyword.fsi (5,19--5,29),
                                { ArrowRange =
-                                  /root/StaticValKeyword.fsi (4,23--4,25) }),
+                                  /root/StaticValKeyword.fsi (5,23--5,25) }),
                             false,
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            None, /root/StaticValKeyword.fsi (4,4--4,29),
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, /root/StaticValKeyword.fsi (5,4--5,29),
                             { LeadingKeyword =
                                Some
                                  (StaticVal
-                                    (/root/StaticValKeyword.fsi (4,4--4,10),
-                                     /root/StaticValKeyword.fsi (4,11--4,14))) }),
-                         /root/StaticValKeyword.fsi (4,4--4,29))],
-                     /root/StaticValKeyword.fsi (4,4--4,29)), [],
-                  /root/StaticValKeyword.fsi (3,5--4,29),
-                  { LeadingKeyword = Type /root/StaticValKeyword.fsi (3,0--3,4)
-                    EqualsRange = Some /root/StaticValKeyword.fsi (3,7--3,8)
+                                    (/root/StaticValKeyword.fsi (5,4--5,10),
+                                     /root/StaticValKeyword.fsi (5,11--5,14))) }),
+                         /root/StaticValKeyword.fsi (5,4--5,29))],
+                     /root/StaticValKeyword.fsi (5,4--5,29)), [],
+                  /root/StaticValKeyword.fsi (4,5--5,29),
+                  { LeadingKeyword = Type /root/StaticValKeyword.fsi (4,0--4,4)
+                    EqualsRange = Some /root/StaticValKeyword.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/StaticValKeyword.fsi (3,0--4,29))], PreXmlDocEmpty, [], None,
-          /root/StaticValKeyword.fsi (1,0--4,29),
-          { LeadingKeyword = Namespace /root/StaticValKeyword.fsi (1,0--1,9) })],
+              /root/StaticValKeyword.fsi (4,0--5,29))], PreXmlDocEmpty, [], None,
+          /root/StaticValKeyword.fsi (2,0--5,29),
+          { LeadingKeyword = Namespace /root/StaticValKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs
index b203e364bce..7621a6ae5e9 100644
--- a/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs
+++ b/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs
@@ -1,2 +1,3 @@
+
 match x with
-| X(Y  = y) -> y
\ No newline at end of file
+| X(Y  = y) -> y
diff --git a/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
index 81ee58afc64..c052f94649b 100644
--- a/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -9,39 +9,39 @@ ImplFile
           [Expr
              (Match
                 (Yes
-                   /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (1,0--1,12),
+                   /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--2,12),
                  Ident x,
                  [SynMatchClause
                     (LongIdent
                        (SynLongIdent ([X], [], [None]), None, None,
                         NamePatPairs
                           ([(Y,
-                             /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,7--2,8),
+                             /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,7--3,8),
                              Named
                                (SynIdent (y, None), false, None,
-                                /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,9--2,10)))],
-                           /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,4--2,11),
+                                /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,9--3,10)))],
+                           /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,4--3,11),
                            { ParenRange =
-                              /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,3--2,11) }),
+                              /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,3--3,11) }),
                         None,
-                        /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,2--2,11)),
+                        /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,2--3,11)),
                      None, Ident y,
-                     /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,2--2,16),
+                     /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,2--3,16),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,12--2,14)
+                          /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,12--3,14)
                        BarRange =
                         Some
-                          /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--2,1) })],
-                 /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (1,0--2,16),
+                          /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,0--3,1) })],
+                 /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--3,16),
                  { MatchKeyword =
-                    /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (1,0--1,5)
+                    /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--2,5)
                    WithKeyword =
-                    /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (1,8--1,12) }),
-              /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (1,0--2,16))],
+                    /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,8--2,12) }),
+              /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--3,16))],
           PreXmlDocEmpty, [], None,
-          /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (1,0--2,16),
+          /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs
index 4aecc5f0f32..e98eb0ec482 100644
--- a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs
+++ b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs
@@ -1 +1,2 @@
-let bytes = "yo"B
\ No newline at end of file
+
+let bytes = "yo"B
diff --git a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs.bsl
index 4e16cf7feb8..d84870b549d 100644
--- a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs.bsl
@@ -8,31 +8,31 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (bytes, None), false, None,
-                     /root/SynConstBytesWithSynByteStringKindRegular.fs (1,4--1,9)),
+                     /root/SynConstBytesWithSynByteStringKindRegular.fs (2,4--2,9)),
                   None,
                   Const
                     (Bytes
                        ([|121uy; 111uy|], Regular,
-                        /root/SynConstBytesWithSynByteStringKindRegular.fs (1,12--1,17)),
-                     /root/SynConstBytesWithSynByteStringKindRegular.fs (1,12--1,17)),
-                  /root/SynConstBytesWithSynByteStringKindRegular.fs (1,4--1,9),
+                        /root/SynConstBytesWithSynByteStringKindRegular.fs (2,12--2,17)),
+                     /root/SynConstBytesWithSynByteStringKindRegular.fs (2,12--2,17)),
+                  /root/SynConstBytesWithSynByteStringKindRegular.fs (2,4--2,9),
                   Yes
-                    /root/SynConstBytesWithSynByteStringKindRegular.fs (1,0--1,17),
+                    /root/SynConstBytesWithSynByteStringKindRegular.fs (2,0--2,17),
                   { LeadingKeyword =
                      Let
-                       /root/SynConstBytesWithSynByteStringKindRegular.fs (1,0--1,3)
+                       /root/SynConstBytesWithSynByteStringKindRegular.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynConstBytesWithSynByteStringKindRegular.fs (1,10--1,11) })],
-              /root/SynConstBytesWithSynByteStringKindRegular.fs (1,0--1,17))],
+                       /root/SynConstBytesWithSynByteStringKindRegular.fs (2,10--2,11) })],
+              /root/SynConstBytesWithSynByteStringKindRegular.fs (2,0--2,17))],
           PreXmlDocEmpty, [], None,
-          /root/SynConstBytesWithSynByteStringKindRegular.fs (1,0--1,17),
+          /root/SynConstBytesWithSynByteStringKindRegular.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs
index 1a5eb43eb60..2caaff3c615 100644
--- a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs
+++ b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs
@@ -1 +1,2 @@
-let bytes = @"yo"B
\ No newline at end of file
+
+let bytes = @"yo"B
diff --git a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
index dbebd903a54..de7280c1814 100644
--- a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
@@ -8,31 +8,31 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (bytes, None), false, None,
-                     /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,4--1,9)),
+                     /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,4--2,9)),
                   None,
                   Const
                     (Bytes
                        ([|121uy; 111uy|], Verbatim,
-                        /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,12--1,18)),
-                     /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,12--1,18)),
-                  /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,4--1,9),
+                        /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,12--2,18)),
+                     /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,12--2,18)),
+                  /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,4--2,9),
                   Yes
-                    /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,0--1,18),
+                    /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,0--2,18),
                   { LeadingKeyword =
                      Let
-                       /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,0--1,3)
+                       /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,10--1,11) })],
-              /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,0--1,18))],
+                       /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,10--2,11) })],
+              /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,0--2,18))],
           PreXmlDocEmpty, [], None,
-          /root/SynConstBytesWithSynByteStringKindVerbatim.fs (1,0--1,18),
+          /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs
index bbcc8ae0ed0..93e2f90b873 100644
--- a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs
+++ b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs
@@ -1 +1,2 @@
-let s = "yo"
\ No newline at end of file
+
+let s = "yo"
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs.bsl
index e4d51148aca..c9d2ce3452d 100644
--- a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs.bsl
@@ -8,31 +8,31 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (s, None), false, None,
-                     /root/SynConstStringWithSynStringKindRegular.fs (1,4--1,5)),
+                     /root/SynConstStringWithSynStringKindRegular.fs (2,4--2,5)),
                   None,
                   Const
                     (String
                        ("yo", Regular,
-                        /root/SynConstStringWithSynStringKindRegular.fs (1,8--1,12)),
-                     /root/SynConstStringWithSynStringKindRegular.fs (1,8--1,12)),
-                  /root/SynConstStringWithSynStringKindRegular.fs (1,4--1,5),
+                        /root/SynConstStringWithSynStringKindRegular.fs (2,8--2,12)),
+                     /root/SynConstStringWithSynStringKindRegular.fs (2,8--2,12)),
+                  /root/SynConstStringWithSynStringKindRegular.fs (2,4--2,5),
                   Yes
-                    /root/SynConstStringWithSynStringKindRegular.fs (1,0--1,12),
+                    /root/SynConstStringWithSynStringKindRegular.fs (2,0--2,12),
                   { LeadingKeyword =
                      Let
-                       /root/SynConstStringWithSynStringKindRegular.fs (1,0--1,3)
+                       /root/SynConstStringWithSynStringKindRegular.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynConstStringWithSynStringKindRegular.fs (1,6--1,7) })],
-              /root/SynConstStringWithSynStringKindRegular.fs (1,0--1,12))],
+                       /root/SynConstStringWithSynStringKindRegular.fs (2,6--2,7) })],
+              /root/SynConstStringWithSynStringKindRegular.fs (2,0--2,12))],
           PreXmlDocEmpty, [], None,
-          /root/SynConstStringWithSynStringKindRegular.fs (1,0--1,12),
+          /root/SynConstStringWithSynStringKindRegular.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs
index cb24facf13d..975c79e9ab8 100644
--- a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs
+++ b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs
@@ -1 +1,2 @@
-let s = \"\"\"yo\"\"\"
\ No newline at end of file
+
+let s = \"\"\"yo\"\"\"
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs.bsl
index 32c20b474a1..163b7cfe131 100644
--- a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs.bsl
@@ -8,29 +8,29 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (s, None), false, None,
-                     /root/SynConstStringWithSynStringKindTripleQuote.fs (1,4--1,5)),
+                     /root/SynConstStringWithSynStringKindTripleQuote.fs (2,4--2,5)),
                   None,
                   ArbitraryAfterError
                     ("localBinding1",
-                     /root/SynConstStringWithSynStringKindTripleQuote.fs (1,7--1,7)),
-                  /root/SynConstStringWithSynStringKindTripleQuote.fs (1,4--1,5),
+                     /root/SynConstStringWithSynStringKindTripleQuote.fs (2,7--2,7)),
+                  /root/SynConstStringWithSynStringKindTripleQuote.fs (2,4--2,5),
                   Yes
-                    /root/SynConstStringWithSynStringKindTripleQuote.fs (1,4--1,7),
+                    /root/SynConstStringWithSynStringKindTripleQuote.fs (2,4--2,7),
                   { LeadingKeyword =
                      Let
-                       /root/SynConstStringWithSynStringKindTripleQuote.fs (1,0--1,3)
+                       /root/SynConstStringWithSynStringKindTripleQuote.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynConstStringWithSynStringKindTripleQuote.fs (1,6--1,7) })],
-              /root/SynConstStringWithSynStringKindTripleQuote.fs (1,0--1,7))],
+                       /root/SynConstStringWithSynStringKindTripleQuote.fs (2,6--2,7) })],
+              /root/SynConstStringWithSynStringKindTripleQuote.fs (2,0--2,7))],
           PreXmlDocEmpty, [], None,
-          /root/SynConstStringWithSynStringKindTripleQuote.fs (1,0--1,22),
+          /root/SynConstStringWithSynStringKindTripleQuote.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs
index be1d91d0109..ee9523f2993 100644
--- a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs
+++ b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs
@@ -1 +1,2 @@
-let s = @"yo"
\ No newline at end of file
+
+let s = @"yo"
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs.bsl
index 1d14f8f70a6..80af08e4cea 100644
--- a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs.bsl
@@ -8,31 +8,31 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (s, None), false, None,
-                     /root/SynConstStringWithSynStringKindVerbatim.fs (1,4--1,5)),
+                     /root/SynConstStringWithSynStringKindVerbatim.fs (2,4--2,5)),
                   None,
                   Const
                     (String
                        ("yo", Verbatim,
-                        /root/SynConstStringWithSynStringKindVerbatim.fs (1,8--1,13)),
-                     /root/SynConstStringWithSynStringKindVerbatim.fs (1,8--1,13)),
-                  /root/SynConstStringWithSynStringKindVerbatim.fs (1,4--1,5),
+                        /root/SynConstStringWithSynStringKindVerbatim.fs (2,8--2,13)),
+                     /root/SynConstStringWithSynStringKindVerbatim.fs (2,8--2,13)),
+                  /root/SynConstStringWithSynStringKindVerbatim.fs (2,4--2,5),
                   Yes
-                    /root/SynConstStringWithSynStringKindVerbatim.fs (1,0--1,13),
+                    /root/SynConstStringWithSynStringKindVerbatim.fs (2,0--2,13),
                   { LeadingKeyword =
                      Let
-                       /root/SynConstStringWithSynStringKindVerbatim.fs (1,0--1,3)
+                       /root/SynConstStringWithSynStringKindVerbatim.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynConstStringWithSynStringKindVerbatim.fs (1,6--1,7) })],
-              /root/SynConstStringWithSynStringKindVerbatim.fs (1,0--1,13))],
+                       /root/SynConstStringWithSynStringKindVerbatim.fs (2,6--2,7) })],
+              /root/SynConstStringWithSynStringKindVerbatim.fs (2,0--2,13))],
           PreXmlDocEmpty, [], None,
-          /root/SynConstStringWithSynStringKindVerbatim.fs (1,0--1,13),
+          /root/SynConstStringWithSynStringKindVerbatim.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs
index 9274a5c8024..70cf20a2e49 100644
--- a/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs
@@ -1,4 +1,5 @@
+
 namespace X
 
 exception Foo with
-    member Meh () = ()
\ No newline at end of file
+    member Meh () = ()
diff --git a/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
index 4cd7aaad7f0..ba2fb1d2b68 100644
--- a/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -11,16 +11,16 @@ ImplFile
                    ([],
                     SynUnionCase
                       ([], SynIdent (Foo, None), Fields [], PreXmlDocEmpty, None,
-                       /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (3,10--3,13),
+                       /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,10--4,13),
                        { BarRange = None }), None,
-                    PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                    /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (3,0--3,13)),
+                    PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                    /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,0--4,13)),
                  Some
-                   /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (3,14--3,18),
+                   /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,14--4,18),
                  [Member
                     (SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (Some { IsInstance = true
                                   IsDispatchSlot = false
@@ -37,30 +37,30 @@ ImplFile
                              [Paren
                                 (Const
                                    (Unit,
-                                    /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,15--4,17)),
-                                 /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,15--4,17))],
+                                    /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,15--5,17)),
+                                 /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,15--5,17))],
                            None,
-                           /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,11--4,17)),
+                           /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,11--5,17)),
                         None,
                         Const
                           (Unit,
-                           /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,20--4,22)),
-                        /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,11--4,17),
+                           /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,20--5,22)),
+                        /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,11--5,17),
                         NoneAtInvisible,
                         { LeadingKeyword =
                            Member
-                             /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
+                             /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,4--5,10)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,18--4,19) }),
-                     /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,4--4,22))],
-                 /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (3,0--4,22)),
-              /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (3,0--4,22))],
+                             /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,18--5,19) }),
+                     /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,4--5,22))],
+                 /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,0--5,22)),
+              /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,0--5,22))],
           PreXmlDocEmpty, [], None,
-          /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (1,0--4,22),
+          /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (2,0--5,22),
           { LeadingKeyword =
              Namespace
-               /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (1,0--1,9) })],
+               /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (2,0--2,9) })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi b/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi
index 5e385d118a9..dace0596e7e 100644
--- a/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi
+++ b/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi
@@ -1,4 +1,5 @@
+
 namespace X
 
 exception Foo with
-member Meh : unit -> unit
\ No newline at end of file
+member Meh : unit -> unit
diff --git a/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
index bffb560ae94..ba24aa55c3b 100644
--- a/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
@@ -11,30 +11,30 @@ SigFile
                    ([],
                     SynUnionCase
                       ([], SynIdent (Foo, None), Fields [], PreXmlDocEmpty, None,
-                       /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,10--3,13),
+                       /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,10--4,13),
                        { BarRange = None }), None,
-                    PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                    /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--3,13)),
+                    PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                    /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,13)),
                  Some
-                   /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,14--3,18),
+                   /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,14--4,18),
                  [Member
                     (SynValSig
                        ([], SynIdent (Meh, None), SynValTyparDecls (None, true),
                         Fun
                           (LongIdent (SynLongIdent ([unit], [], [None])),
                            LongIdent (SynLongIdent ([unit], [], [None])),
-                           /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,13--4,25),
+                           /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,13--5,25),
                            { ArrowRange =
-                              /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,18--4,20) }),
+                              /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,18--5,20) }),
                         SynValInfo
                           ([[SynArgInfo ([], false, None)]],
                            SynArgInfo ([], false, None)), false, false,
-                        PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                         None, None,
-                        /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,25),
+                        /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,25),
                         { LeadingKeyword =
                            Member
-                             /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,6)
+                             /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,6)
                           InlineKeyword = None
                           WithKeyword = None
                           EqualsRange = None }),
@@ -44,14 +44,14 @@ SigFile
                        IsFinal = false
                        GetterOrSetterIsCompilerGenerated = false
                        MemberKind = Member },
-                     /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,25),
+                     /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,25),
                      { GetSetKeywords = None })],
-                 /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--4,25)),
-              /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--4,25))],
+                 /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--5,25)),
+              /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--5,25))],
           PreXmlDocEmpty, [], None,
-          /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (1,0--4,25),
+          /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--5,25),
           { LeadingKeyword =
              Namespace
-               /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (1,0--1,9) })],
+               /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs b/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs
index a9d565bd3b8..ace0ba8c1e1 100644
--- a/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs
+++ b/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs
@@ -1,7 +1,8 @@
+
 async {
     let! bar = getBar ()
 
     and! foo = getFoo ()
 
     return bar
-}
\ No newline at end of file
+}
diff --git a/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs.bsl
index 562dd8d3c26..e28ab295b11 100644
--- a/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs.bsl
@@ -13,46 +13,46 @@ ImplFile
                    (false,
                     LetOrUseBang
                       (Yes
-                         /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,4--2,24),
+                         /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (3,4--3,24),
                        false, true,
                        Named
                          (SynIdent (bar, None), false, None,
-                          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,9--2,12)),
+                          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (3,9--3,12)),
                        App
                          (NonAtomic, false, Ident getBar,
                           Const
                             (Unit,
-                             /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,22--2,24)),
-                          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,15--2,24)),
+                             /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (3,22--3,24)),
+                          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (3,15--3,24)),
                        [SynExprAndBang
                           (Yes
-                             /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (4,4--6,10),
+                             /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (5,4--7,10),
                            false, true,
                            Named
                              (SynIdent (foo, None), false, None,
-                              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (4,9--4,12)),
+                              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (5,9--5,12)),
                            App
                              (NonAtomic, false, Ident getFoo,
                               Const
                                 (Unit,
-                                 /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (4,22--4,24)),
-                              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (4,15--4,24)),
-                           /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (4,4--4,24),
+                                 /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (5,22--5,24)),
+                              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (5,15--5,24)),
+                           /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (5,4--5,24),
                            { EqualsRange =
-                              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (4,13--4,14)
+                              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (5,13--5,14)
                              InKeyword = None })],
                        YieldOrReturn
                          ((false, true), Ident bar,
-                          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (6,4--6,14)),
-                       /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,4--6,14),
+                          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (7,4--7,14)),
+                       /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (3,4--7,14),
                        { EqualsRange =
                           Some
-                            /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,13--2,14) }),
-                    /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (1,6--7,1)),
-                 /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (1,0--7,1)),
-              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (1,0--7,1))],
+                            /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (3,13--3,14) }),
+                    /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,6--8,1)),
+                 /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,0--8,1)),
+              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,0--8,1))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (1,0--7,1),
+          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,0--8,1),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs b/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs
index a25bb24ced5..d1983af8f59 100644
--- a/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs
@@ -1,6 +1,7 @@
+
 struct 
     {| Foo =
     //  meh
     someValue |}
 
-struct {| |}
\ No newline at end of file
+struct {| |}
diff --git a/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs.bsl
index 50c1d706953..58b4fe52e4e 100644
--- a/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs.bsl
@@ -8,19 +8,19 @@ ImplFile
              (AnonRecd
                 (true, None,
                  [(Foo,
-                   Some /root/SynExprAnonRecdWithStructKeyword.fs (2,11--2,12),
+                   Some /root/SynExprAnonRecdWithStructKeyword.fs (3,11--3,12),
                    Ident someValue)],
-                 /root/SynExprAnonRecdWithStructKeyword.fs (1,0--4,16)),
-              /root/SynExprAnonRecdWithStructKeyword.fs (1,0--4,16));
+                 /root/SynExprAnonRecdWithStructKeyword.fs (2,0--5,16)),
+              /root/SynExprAnonRecdWithStructKeyword.fs (2,0--5,16));
            Expr
              (AnonRecd
                 (true, None, [],
-                 /root/SynExprAnonRecdWithStructKeyword.fs (6,0--6,12)),
-              /root/SynExprAnonRecdWithStructKeyword.fs (6,0--6,12))],
+                 /root/SynExprAnonRecdWithStructKeyword.fs (7,0--7,12)),
+              /root/SynExprAnonRecdWithStructKeyword.fs (7,0--7,12))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprAnonRecdWithStructKeyword.fs (1,0--6,12),
+          /root/SynExprAnonRecdWithStructKeyword.fs (2,0--7,12),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/SynExprAnonRecdWithStructKeyword.fs (3,4--3,11)] },
+         [LineComment /root/SynExprAnonRecdWithStructKeyword.fs (4,4--4,11)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs b/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs
index a4e6a06508e..a6c3a6f90fc 100644
--- a/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs
+++ b/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs
@@ -1,3 +1,4 @@
+
 {| X = 5
    Y    = 6
-   Z        = 7 |}
\ No newline at end of file
+   Z        = 7 |}
diff --git a/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl b/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
index 325c8f96d51..e1d13141db8 100644
--- a/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
@@ -12,26 +12,26 @@ ImplFile
                 (false, None,
                  [(X,
                    Some
-                     /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (1,5--1,6),
+                     /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,5--2,6),
                    Const
                      (Int32 5,
-                      /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (1,7--1,8)));
+                      /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,7--2,8)));
                   (Y,
                    Some
-                     /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,8--2,9),
+                     /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (3,8--3,9),
                    Const
                      (Int32 6,
-                      /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,10--2,11)));
+                      /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (3,10--3,11)));
                   (Z,
                    Some
-                     /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (3,12--3,13),
+                     /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (4,12--4,13),
                    Const
                      (Int32 7,
-                      /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (3,14--3,15)))],
-                 /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (1,0--3,18)),
-              /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (1,0--3,18))],
+                      /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (4,14--4,15)))],
+                 /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,0--4,18)),
+              /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,0--4,18))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (1,0--3,18),
+          /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,0--4,18),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs b/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs
index f252d0dcb07..05d15254d23 100644
--- a/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs
@@ -1,5 +1,6 @@
+
 let a =
     do
         foobar
     do!
-        foobarBang
\ No newline at end of file
+        foobarBang
diff --git a/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
index 80ccc811057..dd2811dd41d 100644
--- a/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
@@ -8,34 +8,34 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (a, None), false, None,
-                     /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (1,4--1,5)),
+                     /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,4--2,5)),
                   None,
                   Sequential
                     (SuppressNeither, true,
                      Do
                        (Ident foobar,
-                        /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,4--3,14)),
+                        /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (3,4--4,14)),
                      DoBang
                        (Ident foobarBang,
-                        /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (4,4--5,18)),
-                     /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,4--5,18)),
-                  /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (1,4--1,5),
+                        /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (5,4--6,18)),
+                     /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (3,4--6,18)),
+                  /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,4--2,5),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (1,0--1,3)
+                       /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (1,6--1,7) })],
-              /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (1,0--5,18))],
+                       /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,6--2,7) })],
+              /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,0--6,18))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (1,0--5,18),
+          /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs
index 1e8eb27d4f8..54d422077db 100644
--- a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs
+++ b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs
@@ -1 +1,2 @@
-x?k
\ No newline at end of file
+
+x?k
diff --git a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs.bsl b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs.bsl
index df08e4e4104..5058fb8a389 100644
--- a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs.bsl
@@ -6,11 +6,11 @@ ImplFile
          ([SynExprDynamicDoesContainIdent], false, AnonModule,
           [Expr
              (Dynamic
-                (Ident x, /root/SynExprDynamicDoesContainIdent.fs (1,1--1,2),
-                 Ident k, /root/SynExprDynamicDoesContainIdent.fs (1,0--1,3)),
-              /root/SynExprDynamicDoesContainIdent.fs (1,0--1,3))],
+                (Ident x, /root/SynExprDynamicDoesContainIdent.fs (2,1--2,2),
+                 Ident k, /root/SynExprDynamicDoesContainIdent.fs (2,0--2,3)),
+              /root/SynExprDynamicDoesContainIdent.fs (2,0--2,3))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprDynamicDoesContainIdent.fs (1,0--1,3),
+          /root/SynExprDynamicDoesContainIdent.fs (2,0--2,3),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs
index a11c285255d..8496ad7b911 100644
--- a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs
+++ b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs
@@ -1 +1,2 @@
-x?(g)
\ No newline at end of file
+
+x?(g)
diff --git a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs.bsl b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs.bsl
index 4562f3166d7..cfcb8820e2e 100644
--- a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs.bsl
@@ -7,17 +7,17 @@ ImplFile
           [Expr
              (Dynamic
                 (Ident x,
-                 /root/SynExprDynamicDoesContainParentheses.fs (1,1--1,2),
+                 /root/SynExprDynamicDoesContainParentheses.fs (2,1--2,2),
                  Paren
                    (Ident g,
-                    /root/SynExprDynamicDoesContainParentheses.fs (1,2--1,3),
+                    /root/SynExprDynamicDoesContainParentheses.fs (2,2--2,3),
                     Some
-                      /root/SynExprDynamicDoesContainParentheses.fs (1,4--1,5),
-                    /root/SynExprDynamicDoesContainParentheses.fs (1,2--1,5)),
-                 /root/SynExprDynamicDoesContainParentheses.fs (1,0--1,5)),
-              /root/SynExprDynamicDoesContainParentheses.fs (1,0--1,5))],
+                      /root/SynExprDynamicDoesContainParentheses.fs (2,4--2,5),
+                    /root/SynExprDynamicDoesContainParentheses.fs (2,2--2,5)),
+                 /root/SynExprDynamicDoesContainParentheses.fs (2,0--2,5)),
+              /root/SynExprDynamicDoesContainParentheses.fs (2,0--2,5))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprDynamicDoesContainParentheses.fs (1,0--1,5),
+          /root/SynExprDynamicDoesContainParentheses.fs (2,0--2,5),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs
index b14d34d6ca7..72f411c0516 100644
--- a/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs
+++ b/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs
@@ -1,2 +1,3 @@
+
 for i = 1 to 10 do
-printf "%d " i
\ No newline at end of file
+printf "%d " i
diff --git a/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
index 111a42d7410..4140d932023 100644
--- a/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -7,19 +7,19 @@ ImplFile
           [Expr
              (For
                 (Yes
-                   /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,0--1,3),
+                   /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--2,3),
                  Yes
-                   /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,10--1,12),
+                   /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,10--2,12),
                  i,
                  Some
-                   /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,6--1,7),
+                   /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,6--2,7),
                  Const
                    (Int32 1,
-                    /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,8--1,9)),
+                    /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,8--2,9)),
                  true,
                  Const
                    (Int32 10,
-                    /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,13--1,15)),
+                    /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,13--2,15)),
                  App
                    (NonAtomic, false,
                     App
@@ -27,15 +27,15 @@ ImplFile
                        Const
                          (String
                             ("%d ", Regular,
-                             /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,7--2,12)),
-                          /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,7--2,12)),
-                       /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--2,12)),
+                             /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (3,7--3,12)),
+                          /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (3,7--3,12)),
+                       /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (3,0--3,12)),
                     Ident i,
-                    /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--2,14)),
-                 /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,0--2,14)),
-              /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,0--2,14))],
+                    /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (3,0--3,14)),
+                 /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--3,14)),
+              /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--3,14))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (1,0--2,14),
+          /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs
index 3c0cf12c442..e00339d81b1 100644
--- a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs
+++ b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs
@@ -1 +1,2 @@
-let s = $"yo {42}"
\ No newline at end of file
+
+let s = $"yo {42}"
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
index 74881026db4..86007622d0d 100644
--- a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
@@ -9,40 +9,40 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (s, None), false, None,
-                     /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,4--1,5)),
+                     /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,4--2,5)),
                   None,
                   InterpolatedString
                     ([String
                         ("yo ",
-                         /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,8--1,14));
+                         /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,8--2,14));
                       FillExpr
                         (Const
                            (Int32 42,
-                            /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,14--1,16)),
+                            /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,14--2,16)),
                          None);
                       String
                         ("",
-                         /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,16--1,18))],
+                         /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,16--2,18))],
                      Regular,
-                     /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,8--1,18)),
-                  /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,4--1,5),
+                     /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,8--2,18)),
+                  /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,4--2,5),
                   Yes
-                    /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,0--1,18),
+                    /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,0--2,18),
                   { LeadingKeyword =
                      Let
-                       /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,0--1,3)
+                       /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,6--1,7) })],
-              /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,0--1,18))],
+                       /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,6--2,7) })],
+              /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,0--2,18))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (1,0--1,18),
+          /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs
index d344c422673..60190c9337d 100644
--- a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs
+++ b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs
@@ -1 +1,2 @@
-let s = $\"\"\"yo {42}\"\"\"
\ No newline at end of file
+
+let s = $\"\"\"yo {42}\"\"\"
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
index 94cb7b1272d..535697ff1e5 100644
--- a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
@@ -10,29 +10,29 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (s, None), false, None,
-                     /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,4--1,5)),
+                     /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,4--2,5)),
                   None,
                   ArbitraryAfterError
                     ("localBinding1",
-                     /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,7--1,7)),
-                  /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,4--1,5),
+                     /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,7--2,7)),
+                  /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,4--2,5),
                   Yes
-                    /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,4--1,7),
+                    /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,4--2,7),
                   { LeadingKeyword =
                      Let
-                       /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,0--1,3)
+                       /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,6--1,7) })],
-              /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,0--1,7))],
+                       /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,6--2,7) })],
+              /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,0--2,7))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (1,0--1,28),
+          /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs
index d0152142b4b..1e8fcd54586 100644
--- a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs
+++ b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs
@@ -1 +1,2 @@
-let s = $@"Migrate notes of file ""{oldId}"" to new file ""{newId}""."
\ No newline at end of file
+
+let s = $@"Migrate notes of file ""{oldId}"" to new file ""{newId}""."
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
index 62b50d5e3da..dd89abf6bce 100644
--- a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
@@ -10,40 +10,40 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (s, None), false, None,
-                     /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,4--1,5)),
+                     /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,4--2,5)),
                   None,
                   InterpolatedString
                     ([String
                         ("Migrate notes of file "",
-                         /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,8--1,36));
+                         /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,8--2,36));
                       FillExpr (Ident oldId, None);
                       String
                         ("" to new file "",
-                         /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,41--1,60));
+                         /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,41--2,60));
                       FillExpr (Ident newId, None);
                       String
                         ("".",
-                         /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,65--1,70))],
+                         /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,65--2,70))],
                      Verbatim,
-                     /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,8--1,70)),
-                  /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,4--1,5),
+                     /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,8--2,70)),
+                  /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,4--2,5),
                   Yes
-                    /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,0--1,70),
+                    /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,0--2,70),
                   { LeadingKeyword =
                      Let
-                       /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,0--1,3)
+                       /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,6--1,7) })],
-              /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,0--1,70))],
+                       /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,6--2,7) })],
+              /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,0--2,70))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (1,0--1,70),
+          /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs
index 6020222bf88..560f4d83d12 100644
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs
@@ -1,5 +1,6 @@
+
 comp {
     let! x = y
     and! z = someFunction ()
     return ()
-}
\ No newline at end of file
+}
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
index 746f1850676..c0fdae9ce5a 100644
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -13,44 +13,44 @@ ImplFile
                    (false,
                     LetOrUseBang
                       (Yes
-                         /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,4--2,14),
+                         /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,4--3,14),
                        false, true,
                        Named
                          (SynIdent (x, None), false, None,
-                          /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,9--2,10)),
+                          /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,9--3,10)),
                        Ident y,
                        [SynExprAndBang
                           (Yes
-                             /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,4--4,10),
+                             /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,4--5,10),
                            false, true,
                            Named
                              (SynIdent (z, None), false, None,
-                              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,9--3,10)),
+                              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,9--4,10)),
                            App
                              (NonAtomic, false, Ident someFunction,
                               Const
                                 (Unit,
-                                 /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,26--3,28)),
-                              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,13--3,28)),
-                           /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,4--3,28),
+                                 /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,26--4,28)),
+                              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,13--4,28)),
+                           /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,4--4,28),
                            { EqualsRange =
-                              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,11--3,12)
+                              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,11--4,12)
                              InKeyword = None })],
                        YieldOrReturn
                          ((false, true),
                           Const
                             (Unit,
-                             /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,11--4,13)),
-                          /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,4--4,13)),
-                       /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,4--4,13),
+                             /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (5,11--5,13)),
+                          /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (5,4--5,13)),
+                       /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,4--5,13),
                        { EqualsRange =
                           Some
-                            /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,11--2,12) }),
-                    /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (1,5--5,1)),
-                 /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (1,0--5,1)),
-              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (1,0--5,1))],
+                            /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,11--3,12) }),
+                    /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,5--6,1)),
+                 /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,0--6,1)),
+              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,0--6,1))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (1,0--5,1),
+          /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,0--6,1),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs
index 38bbedb4457..c7a0badfa17 100644
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs
@@ -1 +1,2 @@
-let x = 1 in ()
\ No newline at end of file
+
+let x = 1 in ()
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
index 20a1cbc176d..09edc090f7c 100644
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
@@ -9,37 +9,37 @@ ImplFile
                 (false, false,
                  [SynBinding
                     (None, Normal, false, false, [],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      SynValData
                        (None, SynValInfo ([], SynArgInfo ([], false, None)),
                         None),
                      Named
                        (SynIdent (x, None), false, None,
-                        /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,4--1,5)),
+                        /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,5)),
                      None,
                      Const
                        (Int32 1,
-                        /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,8--1,9)),
-                     /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,4--1,5),
+                        /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,8--2,9)),
+                     /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,5),
                      Yes
-                       /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--1,9),
+                       /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,9),
                      { LeadingKeyword =
                         Let
-                          /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--1,3)
+                          /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,3)
                        InlineKeyword = None
                        EqualsRange =
                         Some
-                          /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,6--1,7) })],
+                          /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,6--2,7) })],
                  Const
                    (Unit,
-                    /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,13--1,15)),
-                 /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--1,15),
+                    /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,13--2,15)),
+                 /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,15),
                  { InKeyword =
                     Some
-                      /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,10--1,12) }),
-              /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--1,15))],
+                      /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,10--2,12) }),
+              /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,15))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (1,0--1,15),
+          /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,15),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs
index f5000dff440..1f0765a5c7e 100644
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs
@@ -1,3 +1,4 @@
+
 do
 let x = 1     
-()
\ No newline at end of file
+()
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
index be58428cc59..ffb5bbdf0ee 100644
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
@@ -11,36 +11,36 @@ ImplFile
                    (false, false,
                     [SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
                            None),
                         Named
                           (SynIdent (x, None), false, None,
-                           /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,4--2,5)),
+                           /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,4--3,5)),
                         None,
                         Const
                           (Int32 1,
-                           /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,8--2,9)),
-                        /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,4--2,5),
+                           /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,8--3,9)),
+                        /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,4--3,5),
                         Yes
-                          /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--2,9),
+                          /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,0--3,9),
                         { LeadingKeyword =
                            Let
-                             /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--2,3)
+                             /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,0--3,3)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,6--2,7) })],
+                             /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,6--3,7) })],
                     Const
                       (Unit,
-                       /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,0--3,2)),
-                    /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--3,2),
+                       /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (4,0--4,2)),
+                    /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,0--4,2),
                     { InKeyword = None }),
-                 /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (1,0--3,2)),
-              /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (1,0--3,2))],
+                 /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--4,2)),
+              /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--4,2))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (1,0--3,2),
+          /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs
index e547f75fa13..7c802ec1a91 100644
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs
@@ -1,3 +1,4 @@
+
 do
 let e1 = e :?> Collections.DictionaryEntry
-e1.Key, e1.Value
\ No newline at end of file
+e1.Key, e1.Value
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
index c1783e22389..a81cd1e3be6 100644
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
@@ -14,56 +14,56 @@ ImplFile
                    (false, false,
                     [SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
                            None),
                         Named
                           (SynIdent (e1, None), false, None,
-                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,4--2,6)),
+                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,4--3,6)),
                         None,
                         Downcast
                           (Ident e,
                            LongIdent
                              (SynLongIdent
                                 ([Collections; DictionaryEntry],
-                                 [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,26--2,27)],
+                                 [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,26--3,27)],
                                  [None; None])),
-                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,9--2,42)),
-                        /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,4--2,6),
+                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,9--3,42)),
+                        /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,4--3,6),
                         Yes
-                          /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--2,42),
+                          /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,0--3,42),
                         { LeadingKeyword =
                            Let
-                             /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--2,3)
+                             /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,0--3,3)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,7--2,8) })],
+                             /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,7--3,8) })],
                     Tuple
                       (false,
                        [LongIdent
                           (false,
                            SynLongIdent
                              ([e1; Key],
-                              [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,2--3,3)],
+                              [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,2--4,3)],
                               [None; None]), None,
-                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,0--3,6));
+                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,0--4,6));
                         LongIdent
                           (false,
                            SynLongIdent
                              ([e1; Value],
-                              [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,10--3,11)],
+                              [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,10--4,11)],
                               [None; None]), None,
-                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,8--3,16))],
-                       [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,6--3,7)],
-                       /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,0--3,16)),
-                    /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--3,16),
+                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,8--4,16))],
+                       [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,6--4,7)],
+                       /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,0--4,16)),
+                    /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,0--4,16),
                     { InKeyword = None }),
-                 /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (1,0--3,16)),
-              /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (1,0--3,16))],
+                 /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--4,16)),
+              /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--4,16))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (1,0--3,16),
+          /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs
index 31234040154..f86141785d8 100644
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs
@@ -1,4 +1,5 @@
+
 do
     let rec f = ()
     and g = () in
-    ()
\ No newline at end of file
+    ()
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
index 303381cc53f..9ae539242ba 100644
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
@@ -13,62 +13,62 @@ ImplFile
                    (true, false,
                     [SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
                            None),
                         Named
                           (SynIdent (f, None), false, None,
-                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,12--2,13)),
+                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,12--3,13)),
                         None,
                         Const
                           (Unit,
-                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,16--2,18)),
-                        /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,12--2,13),
+                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,16--3,18)),
+                        /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,12--3,13),
                         Yes
-                          /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,4--2,18),
+                          /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,4--3,18),
                         { LeadingKeyword =
                            LetRec
-                             (/root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,4--2,7),
-                              /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,8--2,11))
+                             (/root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,4--3,7),
+                              /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,8--3,11))
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,14--2,15) });
+                             /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,14--3,15) });
                      SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((3,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((4,8), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
                            None),
                         Named
                           (SynIdent (g, None), false, None,
-                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,8--3,9)),
+                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,8--4,9)),
                         None,
                         Const
                           (Unit,
-                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,12--3,14)),
-                        /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,8--3,9),
+                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,12--4,14)),
+                        /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,8--4,9),
                         Yes
-                          /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,4--3,14),
+                          /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,4--4,14),
                         { LeadingKeyword =
                            And
-                             /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,4--3,7)
+                             /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,4--4,7)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,10--3,11) })],
+                             /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,10--4,11) })],
                     Const
                       (Unit,
-                       /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,4--4,6)),
-                    /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,4--4,6),
+                       /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (5,4--5,6)),
+                    /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,4--5,6),
                     { InKeyword =
                        Some
-                         /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,15--3,17) }),
-                 /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (1,0--4,6)),
-              /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (1,0--4,6))],
+                         /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,15--4,17) }),
+                 /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,0--5,6)),
+              /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,0--5,6))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (1,0--4,6),
+          /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs b/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs
index 8e56ad251b2..aa58db744b4 100644
--- a/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs
@@ -1,2 +1,3 @@
+
 match! x with
-| y -> z
\ No newline at end of file
+| y -> z
diff --git a/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
index 06d2a5885ce..9ac1fcca014 100644
--- a/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
@@ -9,29 +9,29 @@ ImplFile
           [Expr
              (MatchBang
                 (Yes
-                   /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--1,13),
+                   /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,13),
                  Ident x,
                  [SynMatchClause
                     (Named
                        (SynIdent (y, None), false, None,
-                        /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,2--2,3)),
+                        /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (3,2--3,3)),
                      None, Ident z,
-                     /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,2--2,8),
+                     /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (3,2--3,8),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,4--2,6)
+                          /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (3,4--3,6)
                        BarRange =
                         Some
-                          /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,1) })],
-                 /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--2,8),
+                          /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (3,0--3,1) })],
+                 /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--3,8),
                  { MatchBangKeyword =
-                    /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--1,6)
+                    /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,6)
                    WithKeyword =
-                    /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (1,9--1,13) }),
-              /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--2,8))],
+                    /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,9--2,13) }),
+              /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--3,8))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--2,8),
+          /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs b/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs
index 44b48ba9697..70ab10a0400 100644
--- a/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs
@@ -1,2 +1,3 @@
+
 match x with
-| y -> z
\ No newline at end of file
+| y -> z
diff --git a/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
index 99dd0603bb8..187bb2e5046 100644
--- a/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
@@ -9,29 +9,29 @@ ImplFile
           [Expr
              (Match
                 (Yes
-                   /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--1,12),
+                   /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,12),
                  Ident x,
                  [SynMatchClause
                     (Named
                        (SynIdent (y, None), false, None,
-                        /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,2--2,3)),
+                        /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (3,2--3,3)),
                      None, Ident z,
-                     /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,2--2,8),
+                     /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (3,2--3,8),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,4--2,6)
+                          /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (3,4--3,6)
                        BarRange =
                         Some
-                          /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,1) })],
-                 /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--2,8),
+                          /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (3,0--3,1) })],
+                 /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--3,8),
                  { MatchKeyword =
-                    /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--1,5)
+                    /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,5)
                    WithKeyword =
-                    /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (1,8--1,12) }),
-              /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--2,8))],
+                    /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,8--2,12) }),
+              /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--3,8))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (1,0--2,8),
+          /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs b/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs
index 78376b2b8a0..80f441b3536 100644
--- a/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs
@@ -1,5 +1,6 @@
+
 { new obj() with
     member x.ToString() = "INotifyEnumerableInternal"
   interface INotifyEnumerableInternal<'T>
   interface IEnumerable<_> with
-    member x.GetEnumerator() = null }
\ No newline at end of file
+    member x.GetEnumerator() = null }
diff --git a/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
index 26bae5aefad..3d2519920f0 100644
--- a/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
@@ -10,15 +10,15 @@ ImplFile
                  Some
                    (Const
                       (Unit,
-                       /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (1,9--1,11)),
+                       /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,9--2,11)),
                     None),
                  Some
-                   /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (1,12--1,16),
+                   /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,12--2,16),
                  [],
                  [Member
                     (SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (Some { IsInstance = true
                                   IsDispatchSlot = false
@@ -32,68 +32,68 @@ ImplFile
                         LongIdent
                           (SynLongIdent
                              ([x; ToString],
-                              [/root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,12--2,13)],
+                              [/root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,12--3,13)],
                               [None; None]), None, None,
                            Pats
                              [Paren
                                 (Const
                                    (Unit,
-                                    /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,21--2,23)),
-                                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,21--2,23))],
+                                    /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,21--3,23)),
+                                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,21--3,23))],
                            None,
-                           /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,11--2,23)),
+                           /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,11--3,23)),
                         None,
                         Const
                           (String
                              ("INotifyEnumerableInternal", Regular,
-                              /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,26--2,53)),
-                           /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,26--2,53)),
-                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,11--2,23),
+                              /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,26--3,53)),
+                           /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,26--3,53)),
+                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,11--3,23),
                         NoneAtInvisible,
                         { LeadingKeyword =
                            Member
-                             /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,4--2,10)
+                             /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,4--3,10)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,24--2,25) }),
-                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,4--2,53))],
+                             /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,24--3,25) }),
+                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,4--3,53))],
                  [SynInterfaceImpl
                     (App
                        (LongIdent
                           (SynLongIdent
                              ([INotifyEnumerableInternal], [], [None])),
                         Some
-                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,37--3,38),
+                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,37--4,38),
                         [Var
                            (SynTypar (T, None, false),
-                            /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,38--3,40))],
+                            /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,38--4,40))],
                         [],
                         Some
-                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,40--3,41),
+                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,40--4,41),
                         false,
-                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,12--3,41)),
+                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,12--4,41)),
                      None, [], [],
-                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,2--4,2));
+                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,2--5,2));
                   SynInterfaceImpl
                     (App
                        (LongIdent (SynLongIdent ([IEnumerable], [], [None])),
                         Some
-                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,23--4,24),
+                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,23--5,24),
                         [Anon
-                           /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,24--4,25)],
+                           /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,24--5,25)],
                         [],
                         Some
-                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,25--4,26),
+                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,25--5,26),
                         false,
-                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,12--4,26)),
+                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,12--5,26)),
                      Some
-                       /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,27--4,31),
+                       /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,27--5,31),
                      [],
                      [Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -107,35 +107,35 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([x; GetEnumerator],
-                                  [/root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,12--5,13)],
+                                  [/root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,12--6,13)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,26--5,28)),
-                                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,26--5,28))],
+                                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,26--6,28)),
+                                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,26--6,28))],
                                None,
-                               /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,11--5,28)),
+                               /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,11--6,28)),
                             None,
                             Null
-                              /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,31--5,35),
-                            /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,11--5,28),
+                              /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,31--6,35),
+                            /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,11--6,28),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,4--5,10)
+                                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,4--6,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,29--5,30) }),
-                         /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,4--5,35))],
-                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,2--5,37))],
-                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (1,2--1,11),
-                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (1,0--5,37)),
-              /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (1,0--5,37))],
+                                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,29--6,30) }),
+                         /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,4--6,35))],
+                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,2--6,37))],
+                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,2--2,11),
+                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,0--6,37)),
+              /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,0--6,37))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (1,0--5,37),
+          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,0--6,37),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs b/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs
index a4cc5740fd6..3524bdada38 100644
--- a/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs
+++ b/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs
@@ -1,6 +1,7 @@
+
 let meh =
     { new Interface with
         override this.Foo () = ()
         member this.Bar () = ()
       interface SomethingElse with
-        member this.Blah () = () }
\ No newline at end of file
+        member this.Blah () = () }
diff --git a/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs.bsl b/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs.bsl
index 04f63f51967..1efda36f007 100644
--- a/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs.bsl
@@ -8,22 +8,22 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (meh, None), false, None,
-                     /root/SynExprObjMembersHaveCorrectKeywords.fs (1,4--1,7)),
+                     /root/SynExprObjMembersHaveCorrectKeywords.fs (2,4--2,7)),
                   None,
                   ObjExpr
                     (LongIdent (SynLongIdent ([Interface], [], [None])), None,
                      Some
-                       /root/SynExprObjMembersHaveCorrectKeywords.fs (2,20--2,24),
+                       /root/SynExprObjMembersHaveCorrectKeywords.fs (3,20--3,24),
                      [],
                      [Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((3,8), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((4,8), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -37,34 +37,34 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; Foo],
-                                  [/root/SynExprObjMembersHaveCorrectKeywords.fs (3,21--3,22)],
+                                  [/root/SynExprObjMembersHaveCorrectKeywords.fs (4,21--4,22)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynExprObjMembersHaveCorrectKeywords.fs (3,26--3,28)),
-                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (3,26--3,28))],
+                                        /root/SynExprObjMembersHaveCorrectKeywords.fs (4,26--4,28)),
+                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (4,26--4,28))],
                                None,
-                               /root/SynExprObjMembersHaveCorrectKeywords.fs (3,17--3,28)),
+                               /root/SynExprObjMembersHaveCorrectKeywords.fs (4,17--4,28)),
                             None,
                             Const
                               (Unit,
-                               /root/SynExprObjMembersHaveCorrectKeywords.fs (3,31--3,33)),
-                            /root/SynExprObjMembersHaveCorrectKeywords.fs (3,17--3,28),
+                               /root/SynExprObjMembersHaveCorrectKeywords.fs (4,31--4,33)),
+                            /root/SynExprObjMembersHaveCorrectKeywords.fs (4,17--4,28),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Override
-                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (3,8--3,16)
+                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (4,8--4,16)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (3,29--3,30) }),
-                         /root/SynExprObjMembersHaveCorrectKeywords.fs (3,8--3,33));
+                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (4,29--4,30) }),
+                         /root/SynExprObjMembersHaveCorrectKeywords.fs (4,8--4,33));
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((4,8), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((5,8), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -78,39 +78,39 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; Bar],
-                                  [/root/SynExprObjMembersHaveCorrectKeywords.fs (4,19--4,20)],
+                                  [/root/SynExprObjMembersHaveCorrectKeywords.fs (5,19--5,20)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynExprObjMembersHaveCorrectKeywords.fs (4,24--4,26)),
-                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (4,24--4,26))],
+                                        /root/SynExprObjMembersHaveCorrectKeywords.fs (5,24--5,26)),
+                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (5,24--5,26))],
                                None,
-                               /root/SynExprObjMembersHaveCorrectKeywords.fs (4,15--4,26)),
+                               /root/SynExprObjMembersHaveCorrectKeywords.fs (5,15--5,26)),
                             None,
                             Const
                               (Unit,
-                               /root/SynExprObjMembersHaveCorrectKeywords.fs (4,29--4,31)),
-                            /root/SynExprObjMembersHaveCorrectKeywords.fs (4,15--4,26),
+                               /root/SynExprObjMembersHaveCorrectKeywords.fs (5,29--5,31)),
+                            /root/SynExprObjMembersHaveCorrectKeywords.fs (5,15--5,26),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (4,8--4,14)
+                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (5,8--5,14)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (4,27--4,28) }),
-                         /root/SynExprObjMembersHaveCorrectKeywords.fs (4,8--4,31))],
+                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (5,27--5,28) }),
+                         /root/SynExprObjMembersHaveCorrectKeywords.fs (5,8--5,31))],
                      [SynInterfaceImpl
                         (LongIdent (SynLongIdent ([SomethingElse], [], [None])),
                          Some
-                           /root/SynExprObjMembersHaveCorrectKeywords.fs (5,30--5,34),
+                           /root/SynExprObjMembersHaveCorrectKeywords.fs (6,30--6,34),
                          [],
                          [Member
                             (SynBinding
                                (None, Normal, false, false, [],
-                                PreXmlDoc ((6,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                PreXmlDoc ((7,8), FSharp.Compiler.Xml.XmlDocCollector),
                                 SynValData
                                   (Some
                                      { IsInstance = true
@@ -125,45 +125,45 @@ ImplFile
                                 LongIdent
                                   (SynLongIdent
                                      ([this; Blah],
-                                      [/root/SynExprObjMembersHaveCorrectKeywords.fs (6,19--6,20)],
+                                      [/root/SynExprObjMembersHaveCorrectKeywords.fs (7,19--7,20)],
                                       [None; None]), None, None,
                                    Pats
                                      [Paren
                                         (Const
                                            (Unit,
-                                            /root/SynExprObjMembersHaveCorrectKeywords.fs (6,25--6,27)),
-                                         /root/SynExprObjMembersHaveCorrectKeywords.fs (6,25--6,27))],
+                                            /root/SynExprObjMembersHaveCorrectKeywords.fs (7,25--7,27)),
+                                         /root/SynExprObjMembersHaveCorrectKeywords.fs (7,25--7,27))],
                                    None,
-                                   /root/SynExprObjMembersHaveCorrectKeywords.fs (6,15--6,27)),
+                                   /root/SynExprObjMembersHaveCorrectKeywords.fs (7,15--7,27)),
                                 None,
                                 Const
                                   (Unit,
-                                   /root/SynExprObjMembersHaveCorrectKeywords.fs (6,30--6,32)),
-                                /root/SynExprObjMembersHaveCorrectKeywords.fs (6,15--6,27),
+                                   /root/SynExprObjMembersHaveCorrectKeywords.fs (7,30--7,32)),
+                                /root/SynExprObjMembersHaveCorrectKeywords.fs (7,15--7,27),
                                 NoneAtInvisible,
                                 { LeadingKeyword =
                                    Member
-                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (6,8--6,14)
+                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (7,8--7,14)
                                   InlineKeyword = None
                                   EqualsRange =
                                    Some
-                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (6,28--6,29) }),
-                             /root/SynExprObjMembersHaveCorrectKeywords.fs (6,8--6,32))],
-                         /root/SynExprObjMembersHaveCorrectKeywords.fs (5,6--6,34))],
-                     /root/SynExprObjMembersHaveCorrectKeywords.fs (2,6--2,19),
-                     /root/SynExprObjMembersHaveCorrectKeywords.fs (2,4--6,34)),
-                  /root/SynExprObjMembersHaveCorrectKeywords.fs (1,4--1,7),
-                  Yes /root/SynExprObjMembersHaveCorrectKeywords.fs (1,0--6,34),
+                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (7,28--7,29) }),
+                             /root/SynExprObjMembersHaveCorrectKeywords.fs (7,8--7,32))],
+                         /root/SynExprObjMembersHaveCorrectKeywords.fs (6,6--7,34))],
+                     /root/SynExprObjMembersHaveCorrectKeywords.fs (3,6--3,19),
+                     /root/SynExprObjMembersHaveCorrectKeywords.fs (3,4--7,34)),
+                  /root/SynExprObjMembersHaveCorrectKeywords.fs (2,4--2,7),
+                  Yes /root/SynExprObjMembersHaveCorrectKeywords.fs (2,0--7,34),
                   { LeadingKeyword =
                      Let
-                       /root/SynExprObjMembersHaveCorrectKeywords.fs (1,0--1,3)
+                       /root/SynExprObjMembersHaveCorrectKeywords.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynExprObjMembersHaveCorrectKeywords.fs (1,8--1,9) })],
-              /root/SynExprObjMembersHaveCorrectKeywords.fs (1,0--6,34))],
+                       /root/SynExprObjMembersHaveCorrectKeywords.fs (2,8--2,9) })],
+              /root/SynExprObjMembersHaveCorrectKeywords.fs (2,0--7,34))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprObjMembersHaveCorrectKeywords.fs (1,0--6,34),
+          /root/SynExprObjMembersHaveCorrectKeywords.fs (2,0--8,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs b/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs
index 748b583850a..99b683df9fe 100644
--- a/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs
+++ b/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs
@@ -1,6 +1,7 @@
+
 [<AbstractClass>]
 type CFoo() =
     abstract AbstractClassPropertySet: string with set
 
 { new CFoo() with
-    override this.AbstractClassPropertySet with set (v:string) = () }
\ No newline at end of file
+    override this.AbstractClassPropertySet with set (v:string) = () }
diff --git a/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs.bsl b/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs.bsl
index 8c871ee32a7..e0a60c0c8ec 100644
--- a/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs.bsl
@@ -12,22 +12,22 @@ ImplFile
                              SynLongIdent ([AbstractClass], [], [None])
                             ArgExpr =
                              Const
-                               (Unit, /root/SynExprObjWithSetter.fs (1,2--1,15))
+                               (Unit, /root/SynExprObjWithSetter.fs (2,2--2,15))
                             Target = None
                             AppliesToGetterAndSetter = false
-                            Range = /root/SynExprObjWithSetter.fs (1,2--1,15) }]
-                        Range = /root/SynExprObjWithSetter.fs (1,0--1,17) }],
+                            Range = /root/SynExprObjWithSetter.fs (2,2--2,15) }]
+                        Range = /root/SynExprObjWithSetter.fs (2,0--2,17) }],
                      None, [], [CFoo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/SynExprObjWithSetter.fs (2,5--2,9)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/SynExprObjWithSetter.fs (3,5--3,9)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
-                           ([], /root/SynExprObjWithSetter.fs (2,9--2,11)), None,
-                         PreXmlDoc ((2,9), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynExprObjWithSetter.fs (2,5--2,9),
+                           ([], /root/SynExprObjWithSetter.fs (3,9--3,11)), None,
+                         PreXmlDoc ((3,9), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynExprObjWithSetter.fs (3,5--3,9),
                          { AsKeyword = None });
                       AbstractSlot
                         (SynValSig
@@ -36,15 +36,15 @@ ImplFile
                             LongIdent (SynLongIdent ([string], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynExprObjWithSetter.fs (3,4--3,54),
+                            /root/SynExprObjWithSetter.fs (4,4--4,54),
                             { LeadingKeyword =
                                Abstract
-                                 /root/SynExprObjWithSetter.fs (3,4--3,12)
+                                 /root/SynExprObjWithSetter.fs (4,4--4,12)
                               InlineKeyword = None
                               WithKeyword =
-                               Some /root/SynExprObjWithSetter.fs (3,46--3,50)
+                               Some /root/SynExprObjWithSetter.fs (4,46--4,50)
                               EqualsRange = None }),
                          { IsInstance = true
                            IsDispatchSlot = true
@@ -52,39 +52,39 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         /root/SynExprObjWithSetter.fs (3,4--3,54),
+                         /root/SynExprObjWithSetter.fs (4,4--4,54),
                          { GetSetKeywords =
                             Some
-                              (Set /root/SynExprObjWithSetter.fs (3,51--3,54)) })],
-                     /root/SynExprObjWithSetter.fs (3,4--3,54)), [],
+                              (Set /root/SynExprObjWithSetter.fs (4,51--4,54)) })],
+                     /root/SynExprObjWithSetter.fs (4,4--4,54)), [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
-                          ([], /root/SynExprObjWithSetter.fs (2,9--2,11)), None,
-                        PreXmlDoc ((2,9), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynExprObjWithSetter.fs (2,5--2,9),
+                          ([], /root/SynExprObjWithSetter.fs (3,9--3,11)), None,
+                        PreXmlDoc ((3,9), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynExprObjWithSetter.fs (3,5--3,9),
                         { AsKeyword = None })),
-                  /root/SynExprObjWithSetter.fs (1,0--3,54),
+                  /root/SynExprObjWithSetter.fs (2,0--4,54),
                   { LeadingKeyword =
-                     Type /root/SynExprObjWithSetter.fs (2,0--2,4)
+                     Type /root/SynExprObjWithSetter.fs (3,0--3,4)
                     EqualsRange =
-                     Some /root/SynExprObjWithSetter.fs (2,12--2,13)
+                     Some /root/SynExprObjWithSetter.fs (3,12--3,13)
                     WithKeyword = None })],
-              /root/SynExprObjWithSetter.fs (1,0--3,54));
+              /root/SynExprObjWithSetter.fs (2,0--4,54));
            Expr
              (ObjExpr
                 (LongIdent (SynLongIdent ([CFoo], [], [None])),
                  Some
-                   (Const (Unit, /root/SynExprObjWithSetter.fs (5,10--5,12)),
-                    None), Some /root/SynExprObjWithSetter.fs (5,13--5,17), [],
+                   (Const (Unit, /root/SynExprObjWithSetter.fs (6,10--6,12)),
+                    None), Some /root/SynExprObjWithSetter.fs (6,13--6,17), [],
                  [GetSetMember
                     (None,
                      Some
                        (SynBinding
                           (None, Normal, false, false, [],
                            PreXmlMerge
-  (PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((7,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                            SynValData
                              (Some { IsInstance = true
                                      IsDispatchSlot = false
@@ -99,40 +99,40 @@ ImplFile
                            LongIdent
                              (SynLongIdent
                                 ([this; AbstractClassPropertySet],
-                                 [/root/SynExprObjWithSetter.fs (6,17--6,18)],
+                                 [/root/SynExprObjWithSetter.fs (7,17--7,18)],
                                  [None; None]), Some set, None,
                               Pats
                                 [Paren
                                    (Typed
                                       (Named
                                          (SynIdent (v, None), false, None,
-                                          /root/SynExprObjWithSetter.fs (6,53--6,54)),
+                                          /root/SynExprObjWithSetter.fs (7,53--7,54)),
                                        LongIdent
                                          (SynLongIdent ([string], [], [None])),
-                                       /root/SynExprObjWithSetter.fs (6,53--6,61)),
-                                    /root/SynExprObjWithSetter.fs (6,52--6,62))],
-                              None, /root/SynExprObjWithSetter.fs (6,48--6,62)),
+                                       /root/SynExprObjWithSetter.fs (7,53--7,61)),
+                                    /root/SynExprObjWithSetter.fs (7,52--7,62))],
+                              None, /root/SynExprObjWithSetter.fs (7,48--7,62)),
                            None,
                            Const
-                             (Unit, /root/SynExprObjWithSetter.fs (6,65--6,67)),
-                           /root/SynExprObjWithSetter.fs (6,48--6,62),
+                             (Unit, /root/SynExprObjWithSetter.fs (7,65--7,67)),
+                           /root/SynExprObjWithSetter.fs (7,48--7,62),
                            NoneAtInvisible,
                            { LeadingKeyword =
-                              Override /root/SynExprObjWithSetter.fs (6,4--6,12)
+                              Override /root/SynExprObjWithSetter.fs (7,4--7,12)
                              InlineKeyword = None
                              EqualsRange =
-                              Some /root/SynExprObjWithSetter.fs (6,63--6,64) })),
-                     /root/SynExprObjWithSetter.fs (6,4--6,67),
+                              Some /root/SynExprObjWithSetter.fs (7,63--7,64) })),
+                     /root/SynExprObjWithSetter.fs (7,4--7,67),
                      { InlineKeyword = None
-                       WithKeyword = /root/SynExprObjWithSetter.fs (6,43--6,47)
+                       WithKeyword = /root/SynExprObjWithSetter.fs (7,43--7,47)
                        GetKeyword = None
                        AndKeyword = None
                        SetKeyword =
-                        Some /root/SynExprObjWithSetter.fs (6,48--6,51) })], [],
-                 /root/SynExprObjWithSetter.fs (5,2--5,12),
-                 /root/SynExprObjWithSetter.fs (5,0--6,69)),
-              /root/SynExprObjWithSetter.fs (5,0--6,69))], PreXmlDocEmpty, [],
-          None, /root/SynExprObjWithSetter.fs (1,0--6,69),
+                        Some /root/SynExprObjWithSetter.fs (7,48--7,51) })], [],
+                 /root/SynExprObjWithSetter.fs (6,2--6,12),
+                 /root/SynExprObjWithSetter.fs (6,0--7,69)),
+              /root/SynExprObjWithSetter.fs (6,0--7,69))], PreXmlDocEmpty, [],
+          None, /root/SynExprObjWithSetter.fs (2,0--7,69),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs b/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
index bb79bee4911..46ac3c0cddd 100644
--- a/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
+++ b/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
@@ -1,6 +1,7 @@
+
 { V = v
   X      =   // some comment
                 someLongFunctionCall
                     a
                     b
-                    c }
\ No newline at end of file
+                    c }
diff --git a/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
index d6b1b350d8f..e9c6d735540 100644
--- a/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
@@ -13,15 +13,15 @@ ImplFile
                  [SynExprRecordField
                     ((SynLongIdent ([V], [], [None]), true),
                      Some
-                       /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,4--1,5),
+                       /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,4--2,5),
                      Some (Ident v),
                      Some
-                       (/root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,8--2,2),
+                       (/root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,8--3,2),
                         None));
                   SynExprRecordField
                     ((SynLongIdent ([X], [], [None]), true),
                      Some
-                       /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,9--2,10),
+                       /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,9--3,10),
                      Some
                        (App
                           (NonAtomic, false,
@@ -30,19 +30,19 @@ ImplFile
                               App
                                 (NonAtomic, false, Ident someLongFunctionCall,
                                  Ident a,
-                                 /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,16--4,21)),
+                                 /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,16--5,21)),
                               Ident b,
-                              /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,16--5,21)),
+                              /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,16--6,21)),
                            Ident c,
-                           /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,16--6,21))),
+                           /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,16--7,21))),
                      None)],
-                 /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--6,23)),
-              /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--6,23))],
+                 /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--7,23)),
+              /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--7,23))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (1,0--6,23),
+          /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--7,23),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,13--2,28)] },
+            /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,13--3,28)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs b/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs
index e3294c94c7a..ffa3ce69c21 100644
--- a/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs
+++ b/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs
@@ -1,4 +1,5 @@
+
 { JobType = EsriBoundaryImport
       FileToImport = filePath
       State = state
-      DryRun = args.DryRun }
\ No newline at end of file
+      DryRun = args.DryRun }
diff --git a/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl b/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
index 791d9bbe3f7..e87174a4554 100644
--- a/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
@@ -11,7 +11,7 @@ ImplFile
                  [SynExprRecordField
                     ((SynLongIdent ([JobType], [], [None]), true),
                      Some
-                       /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,10--1,11),
+                       /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,10--2,11),
                      Some
                        (App
                           (NonAtomic, false,
@@ -22,7 +22,7 @@ ImplFile
                                  SynLongIdent
                                    ([op_Equality], [],
                                     [Some (OriginalNotation "=")]), None,
-                                 /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (4,13--4,14)),
+                                 /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (5,13--5,14)),
                               App
                                 (NonAtomic, false,
                                  App
@@ -32,7 +32,7 @@ ImplFile
                                        SynLongIdent
                                          ([op_Equality], [],
                                           [Some (OriginalNotation "=")]), None,
-                                       /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (3,12--3,13)),
+                                       /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (4,12--4,13)),
                                     App
                                       (NonAtomic, false,
                                        App
@@ -43,37 +43,37 @@ ImplFile
                                                ([op_Equality], [],
                                                 [Some (OriginalNotation "=")]),
                                              None,
-                                             /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,19--2,20)),
+                                             /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (3,19--3,20)),
                                           App
                                             (NonAtomic, false,
                                              Ident EsriBoundaryImport,
                                              Ident FileToImport,
-                                             /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--2,18)),
-                                          /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--2,20)),
+                                             /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--3,18)),
+                                          /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--3,20)),
                                        App
                                          (NonAtomic, false, Ident filePath,
                                           Ident State,
-                                          /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,21--3,11)),
-                                       /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--3,11)),
-                                    /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--3,13)),
+                                          /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (3,21--4,11)),
+                                       /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--4,11)),
+                                    /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--4,13)),
                                  App
                                    (NonAtomic, false, Ident state, Ident DryRun,
-                                    /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (3,14--4,12)),
-                                 /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--4,12)),
-                              /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--4,14)),
+                                    /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (4,14--5,12)),
+                                 /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--5,12)),
+                              /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--5,14)),
                            LongIdent
                              (false,
                               SynLongIdent
                                 ([args; DryRun],
-                                 [/root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (4,19--4,20)],
+                                 [/root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (5,19--5,20)],
                                  [None; None]), None,
-                              /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (4,15--4,26)),
-                           /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,12--4,26))),
+                              /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (5,15--5,26)),
+                           /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--5,26))),
                      None)],
-                 /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,0--4,28)),
-              /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,0--4,28))],
+                 /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,0--5,28)),
+              /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,0--5,28))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (1,0--4,28),
+          /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,0--5,28),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs b/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs
index 7a0c1c43786..cf160929fda 100644
--- a/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs
+++ b/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs
@@ -1 +1,2 @@
-x?v <- 2
\ No newline at end of file
+
+x?v <- 2
diff --git a/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs.bsl b/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs.bsl
index 49b6894fa88..993577eb83c 100644
--- a/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs.bsl
@@ -7,13 +7,13 @@ ImplFile
           [Expr
              (Set
                 (Dynamic
-                   (Ident x, /root/SynExprSetWithSynExprDynamic.fs (1,1--1,2),
-                    Ident v, /root/SynExprSetWithSynExprDynamic.fs (1,0--1,3)),
+                   (Ident x, /root/SynExprSetWithSynExprDynamic.fs (2,1--2,2),
+                    Ident v, /root/SynExprSetWithSynExprDynamic.fs (2,0--2,3)),
                  Const
-                   (Int32 2, /root/SynExprSetWithSynExprDynamic.fs (1,7--1,8)),
-                 /root/SynExprSetWithSynExprDynamic.fs (1,0--1,8)),
-              /root/SynExprSetWithSynExprDynamic.fs (1,0--1,8))], PreXmlDocEmpty,
-          [], None, /root/SynExprSetWithSynExprDynamic.fs (1,0--1,8),
+                   (Int32 2, /root/SynExprSetWithSynExprDynamic.fs (2,7--2,8)),
+                 /root/SynExprSetWithSynExprDynamic.fs (2,0--2,8)),
+              /root/SynExprSetWithSynExprDynamic.fs (2,0--2,8))], PreXmlDocEmpty,
+          [], None, /root/SynExprSetWithSynExprDynamic.fs (2,0--2,8),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs b/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs
index 753101ee24e..4fb48c6dbdf 100644
--- a/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs
@@ -1,4 +1,5 @@
+
 try
 x
 finally
-()
\ No newline at end of file
+()
diff --git a/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
index 342a1d289b6..1b34c807b40 100644
--- a/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
@@ -11,19 +11,19 @@ ImplFile
                 (Ident x,
                  Const
                    (Unit,
-                    /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,2)),
-                 /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--4,2),
+                    /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (5,0--5,2)),
+                 /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--5,2),
                  Yes
-                   /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--1,3),
+                   /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--2,3),
                  Yes
-                   /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (3,0--3,7),
+                   /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,7),
                  { TryKeyword =
-                    /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--1,3)
+                    /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--2,3)
                    FinallyKeyword =
-                    /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (3,0--3,7) }),
-              /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--4,2))],
+                    /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,7) }),
+              /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--5,2))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--4,2),
+          /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs b/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs
index 3b92c0aa3f1..6203ff40dcf 100644
--- a/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs
@@ -1,4 +1,5 @@
+
 try
 x
 with
-| ex -> y
\ No newline at end of file
+| ex -> y
diff --git a/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
index b9499b9df13..1af5dfe2cb3 100644
--- a/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
@@ -12,32 +12,32 @@ ImplFile
                  [SynMatchClause
                     (Named
                        (SynIdent (ex, None), false, None,
-                        /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,2--4,4)),
+                        /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (5,2--5,4)),
                      None, Ident y,
-                     /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,2--4,9),
+                     /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (5,2--5,9),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,5--4,7)
+                          /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (5,5--5,7)
                        BarRange =
                         Some
-                          /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,1) })],
-                 /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--4,9),
+                          /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (5,0--5,1) })],
+                 /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--5,9),
                  Yes
-                   /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--1,3),
+                   /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--2,3),
                  Yes
-                   /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (3,0--3,4),
+                   /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,4),
                  { TryKeyword =
-                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--1,3)
+                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--2,3)
                    TryToWithRange =
-                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--3,4)
+                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--4,4)
                    WithKeyword =
-                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (3,0--3,4)
+                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,4)
                    WithToEndRange =
-                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (3,0--4,9) }),
-              /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--4,9))],
+                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--5,9) }),
+              /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--5,9))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (1,0--4,9),
+          /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs b/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs
index 0cacccaeb02..ddd1f2dff89 100644
--- a/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs
+++ b/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs
@@ -1 +1,2 @@
-40u<hr / (staff weeks)>
\ No newline at end of file
+
+40u<hr / (staff weeks)>
diff --git a/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs.bsl b/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs.bsl
index e54047c1e0e..c65e050f89b 100644
--- a/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs.bsl
@@ -8,30 +8,30 @@ ImplFile
              (Const
                 (Measure
                    (UInt32 40u,
-                    /root/SynMeasureParenHasCorrectRange.fs (1,0--1,3),
+                    /root/SynMeasureParenHasCorrectRange.fs (2,0--2,3),
                     Divide
                       (Seq
                          ([Named
                              ([hr],
-                              /root/SynMeasureParenHasCorrectRange.fs (1,4--1,6))],
-                          /root/SynMeasureParenHasCorrectRange.fs (1,4--1,6)),
+                              /root/SynMeasureParenHasCorrectRange.fs (2,4--2,6))],
+                          /root/SynMeasureParenHasCorrectRange.fs (2,4--2,6)),
                        Seq
                          ([Paren
                              (Seq
                                 ([Named
                                     ([staff],
-                                     /root/SynMeasureParenHasCorrectRange.fs (1,10--1,15));
+                                     /root/SynMeasureParenHasCorrectRange.fs (2,10--2,15));
                                   Named
                                     ([weeks],
-                                     /root/SynMeasureParenHasCorrectRange.fs (1,16--1,21))],
-                                 /root/SynMeasureParenHasCorrectRange.fs (1,10--1,21)),
-                              /root/SynMeasureParenHasCorrectRange.fs (1,9--1,22))],
-                          /root/SynMeasureParenHasCorrectRange.fs (1,9--1,22)),
-                       /root/SynMeasureParenHasCorrectRange.fs (1,4--1,22))),
-                 /root/SynMeasureParenHasCorrectRange.fs (1,0--1,23)),
-              /root/SynMeasureParenHasCorrectRange.fs (1,0--1,23))],
+                                     /root/SynMeasureParenHasCorrectRange.fs (2,16--2,21))],
+                                 /root/SynMeasureParenHasCorrectRange.fs (2,10--2,21)),
+                              /root/SynMeasureParenHasCorrectRange.fs (2,9--2,22))],
+                          /root/SynMeasureParenHasCorrectRange.fs (2,9--2,22)),
+                       /root/SynMeasureParenHasCorrectRange.fs (2,4--2,22))),
+                 /root/SynMeasureParenHasCorrectRange.fs (2,0--2,23)),
+              /root/SynMeasureParenHasCorrectRange.fs (2,0--2,23))],
           PreXmlDocEmpty, [], None,
-          /root/SynMeasureParenHasCorrectRange.fs (1,0--1,23),
+          /root/SynMeasureParenHasCorrectRange.fs (2,0--2,23),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs b/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs
index e9d0d43dd71..16ee21ce51b 100644
--- a/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs
@@ -1,3 +1,4 @@
+
 type Foo =
     abstract X : int
-    abstract member Y: int
\ No newline at end of file
+    abstract member Y: int
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
index 0984cf7f0e9..9ca37936744 100644
--- a/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (1,5--1,8)),
+                     /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [AbstractSlot
@@ -20,12 +20,12 @@ ImplFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,4--2,20),
+                            /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,20),
                             { LeadingKeyword =
                                Abstract
-                                 /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,4--2,12)
+                                 /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,12)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -35,7 +35,7 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,4--2,20),
+                         /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,20),
                          { GetSetKeywords = None });
                       AbstractSlot
                         (SynValSig
@@ -44,13 +44,13 @@ ImplFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,26),
+                            /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (4,4--4,26),
                             { LeadingKeyword =
                                AbstractMember
-                                 (/root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,12),
-                                  /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,13--3,19))
+                                 (/root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (4,4--4,12),
+                                  /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (4,13--4,19))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -60,21 +60,21 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,26),
+                         /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (4,4--4,26),
                          { GetSetKeywords = None })],
-                     /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,4--3,26)),
+                     /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--4,26)),
                   [], None,
-                  /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (1,5--3,26),
+                  /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,5--4,26),
                   { LeadingKeyword =
                      Type
-                       /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (1,0--1,4)
+                       /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (1,9--1,10)
+                       /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (1,0--3,26))],
+              /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,0--4,26))],
           PreXmlDocEmpty, [], None,
-          /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (1,0--3,26),
+          /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs b/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs
index 831cf06b4b1..b1767fe00a9 100644
--- a/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs
@@ -1,5 +1,6 @@
+
 type Foo =
     static member val W : int = 1
     member val X : int = 1
     override val Y : int = 2
-    default val Z : int = 1
\ No newline at end of file
+    default val Z : int = 1
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
index 62a0f2a38d8..7574d1890e5 100644
--- a/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (1,5--1,8)),
+                     /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [AutoProperty
@@ -28,21 +28,21 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None,
                          Const
                            (Int32 1,
-                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,32--2,33)),
-                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,4--2,33),
+                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,32--3,33)),
+                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,4--3,33),
                          { LeadingKeyword =
                             StaticMemberVal
-                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,4--2,10),
-                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,11--2,17),
-                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,18--2,21))
+                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,4--3,10),
+                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,11--3,17),
+                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,18--3,21))
                            WithKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,30--2,31)
+                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,30--3,31)
                            GetSetKeywords = None });
                       AutoProperty
                         ([], false, X,
@@ -59,20 +59,20 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None,
                          Const
                            (Int32 1,
-                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,25--3,26)),
-                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,4--3,26),
+                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,25--4,26)),
+                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,4--4,26),
                          { LeadingKeyword =
                             MemberVal
-                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,4--3,10),
-                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,11--3,14))
+                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,4--4,10),
+                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,11--4,14))
                            WithKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,23--3,24)
+                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,23--4,24)
                            GetSetKeywords = None });
                       AutoProperty
                         ([], false, Y,
@@ -89,20 +89,20 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None,
                          Const
                            (Int32 2,
-                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,27--4,28)),
-                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,4--4,28),
+                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,27--5,28)),
+                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,4--5,28),
                          { LeadingKeyword =
                             OverrideVal
-                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,4--4,12),
-                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,13--4,16))
+                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,4--5,12),
+                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,13--5,16))
                            WithKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,25--4,26)
+                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,25--5,26)
                            GetSetKeywords = None });
                       AutoProperty
                         ([], false, Z,
@@ -119,34 +119,34 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None,
                          Const
                            (Int32 1,
-                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,26--5,27)),
-                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,4--5,27),
+                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,26--6,27)),
+                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,4--6,27),
                          { LeadingKeyword =
                             DefaultVal
-                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,4--5,11),
-                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,12--5,15))
+                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,4--6,11),
+                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,12--6,15))
                            WithKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,24--5,25)
+                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,24--6,25)
                            GetSetKeywords = None })],
-                     /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,4--5,27)),
+                     /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,4--6,27)),
                   [], None,
-                  /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (1,5--5,27),
+                  /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,5--6,27),
                   { LeadingKeyword =
                      Type
-                       /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (1,0--1,4)
+                       /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (1,9--1,10)
+                       /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (1,0--5,27))],
+              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,0--6,27))],
           PreXmlDocEmpty, [], None,
-          /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (1,0--5,27),
+          /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs
index e0163cf4e4f..c1eab544062 100644
--- a/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs
@@ -1,4 +1,5 @@
+
 type Foo() =
     interface Bar with
         member Meh () = ()
-    interface Other
\ No newline at end of file
+    interface Other
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
index 806f323d5d4..6023df3253b 100644
--- a/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -10,29 +10,29 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                            /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                          None,
-                         PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                         PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                          { AsKeyword = None });
                       Interface
                         (LongIdent (SynLongIdent ([Bar], [], [None])),
                          Some
-                           /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,18--2,22),
+                           /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,18--3,22),
                          Some
                            [Member
                               (SynBinding
                                  (None, Normal, false, false, [],
-                                  PreXmlDoc ((3,8), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((4,8), FSharp.Compiler.Xml.XmlDocCollector),
                                   SynValData
                                     (Some
                                        { IsInstance = true
@@ -52,52 +52,52 @@ ImplFile
                                        [Paren
                                           (Const
                                              (Unit,
-                                              /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,19--3,21)),
-                                           /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,19--3,21))],
+                                              /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,19--4,21)),
+                                           /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,19--4,21))],
                                      None,
-                                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,15--3,21)),
+                                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,15--4,21)),
                                   None,
                                   Const
                                     (Unit,
-                                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,24--3,26)),
-                                  /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,15--3,21),
+                                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,24--4,26)),
+                                  /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,15--4,21),
                                   NoneAtInvisible,
                                   { LeadingKeyword =
                                      Member
-                                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,8--3,14)
+                                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,8--4,14)
                                     InlineKeyword = None
                                     EqualsRange =
                                      Some
-                                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,22--3,23) }),
-                               /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,8--3,26))],
-                         /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,4--3,26));
+                                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,22--4,23) }),
+                               /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,8--4,26))],
+                         /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,4--4,26));
                       Interface
                         (LongIdent (SynLongIdent ([Other], [], [None])), None,
                          None,
-                         /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,4--4,19))],
-                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,4--4,19)),
+                         /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (5,4--5,19))],
+                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,4--5,19)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                           /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                         None,
-                        PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                        PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                         { AsKeyword = None })),
-                  /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,5--4,19),
+                  /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,5--5,19),
                   { LeadingKeyword =
                      Type
-                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,11--1,12)
+                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,0--4,19))],
+              /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,0--5,19))],
           PreXmlDocEmpty, [], None,
-          /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (1,0--4,19),
+          /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs b/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs
index cb35603078b..c8cc9b3d234 100644
--- a/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs
@@ -1,5 +1,6 @@
+
 type Foo =
     static member this.B() = ()
     member this.A() = ()
     override this.C() = ()
-    default this.D() = ()
\ No newline at end of file
+    default this.D() = ()
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
index 3d9dddc193f..f45963a8eb2 100644
--- a/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
@@ -8,15 +8,15 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (1,5--1,8)),
+                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = false
                                       IsDispatchSlot = false
@@ -29,35 +29,35 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; B],
-                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,22--2,23)],
+                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,22--3,23)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,24--2,26)),
-                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,24--2,26))],
+                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,24--3,26)),
+                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,24--3,26))],
                                None,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,18--2,26)),
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,18--3,26)),
                             None,
                             Const
                               (Unit,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,29--2,31)),
-                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,18--2,26),
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,29--3,31)),
+                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,18--3,26),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                StaticMember
-                                 (/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,4--2,10),
-                                  /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,11--2,17))
+                                 (/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,4--3,10),
+                                  /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,11--3,17))
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,27--2,28) }),
-                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,4--2,31));
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,27--3,28) }),
+                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,4--3,31));
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -71,34 +71,34 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; A],
-                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,15--3,16)],
+                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,15--4,16)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,17--3,19)),
-                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,17--3,19))],
+                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,17--4,19)),
+                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,17--4,19))],
                                None,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,11--3,19)),
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,11--4,19)),
                             None,
                             Const
                               (Unit,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,22--3,24)),
-                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,11--3,19),
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,22--4,24)),
+                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,11--4,19),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,4--3,10)
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,4--4,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,20--3,21) }),
-                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,4--3,24));
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,20--4,21) }),
+                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,4--4,24));
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -112,34 +112,34 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; C],
-                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,17--4,18)],
+                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,17--5,18)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,19--4,21)),
-                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,19--4,21))],
+                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,19--5,21)),
+                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,19--5,21))],
                                None,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,13--4,21)),
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,13--5,21)),
                             None,
                             Const
                               (Unit,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,24--4,26)),
-                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,13--4,21),
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,24--5,26)),
+                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,13--5,21),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Override
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,4--4,12)
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,4--5,12)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,22--4,23) }),
-                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,4--4,26));
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,22--5,23) }),
+                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,4--5,26));
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
-                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
                                       IsDispatchSlot = false
@@ -153,43 +153,43 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; D],
-                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,16--5,17)],
+                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,16--6,17)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,18--5,20)),
-                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,18--5,20))],
+                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,18--6,20)),
+                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,18--6,20))],
                                None,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,12--5,20)),
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,12--6,20)),
                             None,
                             Const
                               (Unit,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,23--5,25)),
-                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,12--5,20),
+                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,23--6,25)),
+                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,12--6,20),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Default
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,4--5,11)
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,4--6,11)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,21--5,22) }),
-                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,4--5,25))],
-                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,4--5,25)),
+                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,21--6,22) }),
+                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,4--6,25))],
+                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,4--6,25)),
                   [], None,
-                  /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (1,5--5,25),
+                  /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,5--6,25),
                   { LeadingKeyword =
                      Type
-                       /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (1,0--1,4)
+                       /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (1,9--1,10)
+                       /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (1,0--5,25))],
+              /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,0--6,25))],
           PreXmlDocEmpty, [], None,
-          /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (1,0--5,25),
+          /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi b/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi
index 97452254a2d..458c2a046d0 100644
--- a/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi
+++ b/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi
@@ -1,3 +1,4 @@
+
 namespace X
 
 type Y =
@@ -6,4 +7,4 @@ type Y =
     static member C : string
     member D : int
     override E : int
-    default F : int
\ No newline at end of file
+    default F : int
diff --git a/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi.bsl b/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
index 9179b48a9a0..cc9b18c5e0d 100644
--- a/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
@@ -8,9 +8,9 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Y],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynMemberSigMemberHasCorrectKeywords.fsi (3,5--3,6)),
+                     /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -20,12 +20,12 @@ SigFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,4--4,20),
+                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,20),
                             { LeadingKeyword =
                                Abstract
-                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,4--4,12)
+                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,12)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -35,7 +35,7 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,4--4,20),
+                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,20),
                          { GetSetKeywords = None });
                       Member
                         (SynValSig
@@ -44,13 +44,13 @@ SigFile
                             LongIdent (SynLongIdent ([double], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,30),
+                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,30),
                             { LeadingKeyword =
                                AbstractMember
-                                 (/root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,12),
-                                  /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,13--5,19))
+                                 (/root/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,12),
+                                  /root/SynMemberSigMemberHasCorrectKeywords.fsi (6,13--6,19))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -60,7 +60,7 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,30),
+                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,30),
                          { GetSetKeywords = None });
                       Member
                         (SynValSig
@@ -69,13 +69,13 @@ SigFile
                             LongIdent (SynLongIdent ([string], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((7,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,28),
+                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,28),
                             { LeadingKeyword =
                                StaticMember
-                                 (/root/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,10),
-                                  /root/SynMemberSigMemberHasCorrectKeywords.fsi (6,11--6,17))
+                                 (/root/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,10),
+                                  /root/SynMemberSigMemberHasCorrectKeywords.fsi (7,11--7,17))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -85,7 +85,7 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,28),
+                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,28),
                          { GetSetKeywords = None });
                       Member
                         (SynValSig
@@ -94,12 +94,12 @@ SigFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((7,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((8,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,18),
+                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,18),
                             { LeadingKeyword =
                                Member
-                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,10)
+                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,10)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -109,7 +109,7 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,18),
+                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,18),
                          { GetSetKeywords = None });
                       Member
                         (SynValSig
@@ -118,12 +118,12 @@ SigFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((8,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((9,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,20),
+                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,20),
                             { LeadingKeyword =
                                Override
-                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,12)
+                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,12)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -133,7 +133,7 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,20),
+                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,20),
                          { GetSetKeywords = None });
                       Member
                         (SynValSig
@@ -142,12 +142,12 @@ SigFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((9,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((10,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,19),
+                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (10,4--10,19),
                             { LeadingKeyword =
                                Default
-                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,11)
+                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (10,4--10,11)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -157,21 +157,22 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,19),
+                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (10,4--10,19),
                          { GetSetKeywords = None })],
-                     /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,4--9,19)),
-                  [], /root/SynMemberSigMemberHasCorrectKeywords.fsi (3,5--9,19),
+                     /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--10,19)),
+                  [],
+                  /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,5--10,19),
                   { LeadingKeyword =
                      Type
-                       /root/SynMemberSigMemberHasCorrectKeywords.fsi (3,0--3,4)
+                       /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/SynMemberSigMemberHasCorrectKeywords.fsi (3,7--3,8)
+                       /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/SynMemberSigMemberHasCorrectKeywords.fsi (3,0--9,19))],
+              /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,0--10,19))],
           PreXmlDocEmpty, [], None,
-          /root/SynMemberSigMemberHasCorrectKeywords.fsi (1,0--9,19),
+          /root/SynMemberSigMemberHasCorrectKeywords.fsi (2,0--10,19),
           { LeadingKeyword =
-             Namespace /root/SynMemberSigMemberHasCorrectKeywords.fsi (1,0--1,9) })],
+             Namespace /root/SynMemberSigMemberHasCorrectKeywords.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs b/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs
index 2e73c87e9af..459d7a46e3e 100644
--- a/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs
+++ b/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs
@@ -1,4 +1,5 @@
+
 match x with
 | A
 | B -> ()
-| _ -> ()
\ No newline at end of file
+| _ -> ()
diff --git a/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs.bsl b/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs.bsl
index 09b65ba0f82..886f9a2c42a 100644
--- a/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs.bsl
@@ -6,53 +6,53 @@ ImplFile
          ([SynPatOrContainsTheRangeOfTheBar], false, AnonModule,
           [Expr
              (Match
-                (Yes /root/SynPatOrContainsTheRangeOfTheBar.fs (1,0--1,12),
+                (Yes /root/SynPatOrContainsTheRangeOfTheBar.fs (2,0--2,12),
                  Ident x,
                  [SynMatchClause
                     (Or
                        (LongIdent
                           (SynLongIdent ([A], [], [None]), None, None, Pats [],
                            None,
-                           /root/SynPatOrContainsTheRangeOfTheBar.fs (2,2--2,3)),
+                           /root/SynPatOrContainsTheRangeOfTheBar.fs (3,2--3,3)),
                         LongIdent
                           (SynLongIdent ([B], [], [None]), None, None, Pats [],
                            None,
-                           /root/SynPatOrContainsTheRangeOfTheBar.fs (3,2--3,3)),
-                        /root/SynPatOrContainsTheRangeOfTheBar.fs (2,2--3,3),
+                           /root/SynPatOrContainsTheRangeOfTheBar.fs (4,2--4,3)),
+                        /root/SynPatOrContainsTheRangeOfTheBar.fs (3,2--4,3),
                         { BarRange =
-                           /root/SynPatOrContainsTheRangeOfTheBar.fs (3,0--3,1) }),
+                           /root/SynPatOrContainsTheRangeOfTheBar.fs (4,0--4,1) }),
                      None,
                      Const
                        (Unit,
-                        /root/SynPatOrContainsTheRangeOfTheBar.fs (3,7--3,9)),
-                     /root/SynPatOrContainsTheRangeOfTheBar.fs (2,2--3,9), Yes,
+                        /root/SynPatOrContainsTheRangeOfTheBar.fs (4,7--4,9)),
+                     /root/SynPatOrContainsTheRangeOfTheBar.fs (3,2--4,9), Yes,
                      { ArrowRange =
                         Some
-                          /root/SynPatOrContainsTheRangeOfTheBar.fs (3,4--3,6)
+                          /root/SynPatOrContainsTheRangeOfTheBar.fs (4,4--4,6)
                        BarRange =
                         Some
-                          /root/SynPatOrContainsTheRangeOfTheBar.fs (2,0--2,1) });
+                          /root/SynPatOrContainsTheRangeOfTheBar.fs (3,0--3,1) });
                   SynMatchClause
-                    (Wild /root/SynPatOrContainsTheRangeOfTheBar.fs (4,2--4,3),
+                    (Wild /root/SynPatOrContainsTheRangeOfTheBar.fs (5,2--5,3),
                      None,
                      Const
                        (Unit,
-                        /root/SynPatOrContainsTheRangeOfTheBar.fs (4,7--4,9)),
-                     /root/SynPatOrContainsTheRangeOfTheBar.fs (4,2--4,9), Yes,
+                        /root/SynPatOrContainsTheRangeOfTheBar.fs (5,7--5,9)),
+                     /root/SynPatOrContainsTheRangeOfTheBar.fs (5,2--5,9), Yes,
                      { ArrowRange =
                         Some
-                          /root/SynPatOrContainsTheRangeOfTheBar.fs (4,4--4,6)
+                          /root/SynPatOrContainsTheRangeOfTheBar.fs (5,4--5,6)
                        BarRange =
                         Some
-                          /root/SynPatOrContainsTheRangeOfTheBar.fs (4,0--4,1) })],
-                 /root/SynPatOrContainsTheRangeOfTheBar.fs (1,0--4,9),
+                          /root/SynPatOrContainsTheRangeOfTheBar.fs (5,0--5,1) })],
+                 /root/SynPatOrContainsTheRangeOfTheBar.fs (2,0--5,9),
                  { MatchKeyword =
-                    /root/SynPatOrContainsTheRangeOfTheBar.fs (1,0--1,5)
+                    /root/SynPatOrContainsTheRangeOfTheBar.fs (2,0--2,5)
                    WithKeyword =
-                    /root/SynPatOrContainsTheRangeOfTheBar.fs (1,8--1,12) }),
-              /root/SynPatOrContainsTheRangeOfTheBar.fs (1,0--4,9))],
+                    /root/SynPatOrContainsTheRangeOfTheBar.fs (2,8--2,12) }),
+              /root/SynPatOrContainsTheRangeOfTheBar.fs (2,0--5,9))],
           PreXmlDocEmpty, [], None,
-          /root/SynPatOrContainsTheRangeOfTheBar.fs (1,0--4,9),
+          /root/SynPatOrContainsTheRangeOfTheBar.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs
index dea1193b860..6afc9657c4f 100644
--- a/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs
+++ b/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs
@@ -1,3 +1,4 @@
+
 match x with
 | { Foo = bar } -> ()
-| _ -> ()
\ No newline at end of file
+| _ -> ()
diff --git a/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
index 7ed01b3e018..cc27154345a 100644
--- a/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -7,51 +7,51 @@ ImplFile
           [Expr
              (Match
                 (Yes
-                   /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (1,0--1,12),
+                   /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--2,12),
                  Ident x,
                  [SynMatchClause
                     (Record
                        ([(([], Foo),
-                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,8--2,9),
+                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,8--3,9),
                           Named
                             (SynIdent (bar, None), false, None,
-                             /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,10--2,13)))],
-                        /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,2--2,15)),
+                             /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,10--3,13)))],
+                        /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,2--3,15)),
                      None,
                      Const
                        (Unit,
-                        /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,19--2,21)),
-                     /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,2--2,21),
+                        /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,19--3,21)),
+                     /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,2--3,21),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,16--2,18)
+                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,16--3,18)
                        BarRange =
                         Some
-                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--2,1) });
+                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,0--3,1) });
                   SynMatchClause
                     (Wild
-                       /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,2--3,3),
+                       /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,2--4,3),
                      None,
                      Const
                        (Unit,
-                        /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,7--3,9)),
-                     /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,2--3,9),
+                        /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,7--4,9)),
+                     /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,2--4,9),
                      Yes,
                      { ArrowRange =
                         Some
-                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,4--3,6)
+                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,4--4,6)
                        BarRange =
                         Some
-                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,0--3,1) })],
-                 /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (1,0--3,9),
+                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,0--4,1) })],
+                 /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--4,9),
                  { MatchKeyword =
-                    /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (1,0--1,5)
+                    /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--2,5)
                    WithKeyword =
-                    /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (1,8--1,12) }),
-              /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (1,0--3,9))],
+                    /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,8--2,12) }),
+              /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--4,9))],
           PreXmlDocEmpty, [], None,
-          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (1,0--3,9),
+          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi b/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi
index a93f25a4250..3cc5bebeac2 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi
@@ -1,4 +1,5 @@
+
 namespace X
 
 type Foo with
-member Meh : unit -> unit
\ No newline at end of file
+member Meh : unit -> unit
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
index e3f9f353b26..33c95954c16 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
@@ -9,31 +9,31 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,5--3,8)),
+                     /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--4,8)),
                   Simple
                     (None
-                       /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,5--4,25),
-                     /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,5--4,25)),
+                       /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--5,25),
+                     /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--5,25)),
                   [Member
                      (SynValSig
                         ([], SynIdent (Meh, None), SynValTyparDecls (None, true),
                          Fun
                            (LongIdent (SynLongIdent ([unit], [], [None])),
                             LongIdent (SynLongIdent ([unit], [], [None])),
-                            /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,13--4,25),
+                            /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,13--5,25),
                             { ArrowRange =
-                               /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,18--4,20) }),
+                               /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,18--5,20) }),
                          SynValInfo
                            ([[SynArgInfo ([], false, None)]],
                             SynArgInfo ([], false, None)), false, false,
-                         PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                          None, None,
-                         /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,25),
+                         /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,25),
                          { LeadingKeyword =
                             Member
-                              /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,6)
+                              /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,6)
                            InlineKeyword = None
                            WithKeyword = None
                            EqualsRange = None }),
@@ -43,21 +43,21 @@ SigFile
                         IsFinal = false
                         GetterOrSetterIsCompilerGenerated = false
                         MemberKind = Member },
-                      /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,25),
+                      /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,25),
                       { GetSetKeywords = None })],
-                  /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,5--4,25),
+                  /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--5,25),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--3,4)
+                       /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,4)
                     EqualsRange = None
                     WithKeyword =
                      Some
-                       /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,9--3,13) })],
-              /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (3,0--4,25))],
+                       /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,9--4,13) })],
+              /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--5,25))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (1,0--4,25),
+          /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--5,25),
           { LeadingKeyword =
              Namespace
-               /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (1,0--1,9) })],
+               /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi b/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi
index f34388b4fdc..d244e218282 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi
@@ -1,5 +1,6 @@
+
 namespace SomeNamespace
 
 type Bear =
     | BlackBear = 1
-    | PolarBear = 2
\ No newline at end of file
+    | PolarBear = 2
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
index f0fae24d4ff..60c55874d27 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -9,51 +9,51 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Bear],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (3,5--3,9)),
+                     /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,5--4,9)),
                   Simple
                     (Enum
                        ([SynEnumCase
                            ([], SynIdent (BlackBear, None),
                             Const
                               (Int32 1,
-                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,18--4,19)),
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,6--4,19),
+                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,18--5,19)),
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,6--5,19),
                             { BarRange =
                                Some
-                                 /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,4--4,5)
+                                 /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,4--5,5)
                               EqualsRange =
-                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,16--4,17) });
+                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,16--5,17) });
                          SynEnumCase
                            ([], SynIdent (PolarBear, None),
                             Const
                               (Int32 2,
-                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,18--5,19)),
-                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,6--5,19),
+                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (6,18--6,19)),
+                            PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (6,6--6,19),
                             { BarRange =
                                Some
-                                 /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,4--5,5)
+                                 /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (6,4--6,5)
                               EqualsRange =
-                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,16--5,17) })],
-                        /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,4--5,19)),
-                     /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,4--5,19)),
+                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (6,16--6,17) })],
+                        /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,4--6,19)),
+                     /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,4--6,19)),
                   [],
-                  /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (3,5--5,19),
+                  /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,5--6,19),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (3,0--3,4)
+                       /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (3,10--3,11)
+                       /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,10--4,11)
                     WithKeyword = None })],
-              /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (3,0--5,19))],
+              /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,0--6,19))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (1,0--5,19),
+          /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (2,0--6,19),
           { LeadingKeyword =
              Namespace
-               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (1,0--1,9) })],
+               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi
index 616212dc8ad..fedadae109e 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi
@@ -1,5 +1,6 @@
+
 namespace SomeNamespace
 
 type Foobar =
     class
-    end
\ No newline at end of file
+    end
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
index f74eeb4ee5a..c0d18deea51 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -10,26 +10,26 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Foobar],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (3,5--3,11)),
+                     /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,5--4,11)),
                   ObjectModel
                     (Class, [],
-                     /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,4--5,7)),
+                     /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (5,4--6,7)),
                   [],
-                  /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (3,5--5,7),
+                  /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,5--6,7),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (3,0--3,4)
+                       /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (3,12--3,13)
+                       /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,12--4,13)
                     WithKeyword = None })],
-              /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (3,0--5,7))],
+              /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,0--6,7))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (1,0--5,7),
+          /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (2,0--6,7),
           { LeadingKeyword =
              Namespace
-               /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (1,0--1,9) })],
+               /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi
index 13a4b7b07d9..b2a2646819f 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi
@@ -1,3 +1,4 @@
+
 namespace Foo
 
-type X = delegate of string -> string
\ No newline at end of file
+type X = delegate of string -> string
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
index 805e7f5d6d4..1b0a82deb13 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -10,17 +10,17 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,5--3,6)),
+                     /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,5--4,6)),
                   ObjectModel
                     (Delegate
                        (Fun
                           (LongIdent (SynLongIdent ([string], [], [None])),
                            LongIdent (SynLongIdent ([string], [], [None])),
-                           /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,21--3,37),
+                           /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,21--4,37),
                            { ArrowRange =
-                              /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,28--3,30) }),
+                              /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,28--4,30) }),
                         SynValInfo
                           ([[SynArgInfo ([], false, None)]],
                            SynArgInfo ([], false, None))),
@@ -31,14 +31,14 @@ SigFile
                             Fun
                               (LongIdent (SynLongIdent ([string], [], [None])),
                                LongIdent (SynLongIdent ([string], [], [None])),
-                               /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,21--3,37),
+                               /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,21--4,37),
                                { ArrowRange =
-                                  /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,28--3,30) }),
+                                  /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,28--4,30) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]],
                                SynArgInfo ([], false, None)), false, false,
                             PreXmlDocEmpty, None, None,
-                            /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,9--3,37),
+                            /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,9--4,37),
                             { LeadingKeyword = Synthetic
                               InlineKeyword = None
                               WithKeyword = None
@@ -49,23 +49,23 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,9--3,37),
+                         /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,9--4,37),
                          { GetSetKeywords = None })],
-                     /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,9--3,37)),
+                     /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,9--4,37)),
                   [],
-                  /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,5--3,37),
+                  /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,5--4,37),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,0--3,4)
+                       /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,7--3,8)
+                       /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (3,0--3,37))],
+              /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,0--4,37))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (1,0--3,37),
+          /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (2,0--4,37),
           { LeadingKeyword =
              Namespace
-               /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (1,0--1,9) })],
+               /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi b/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi
index 47ce1274f74..f353be212ad 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi
@@ -1,5 +1,6 @@
+
 namespace SomeNamespace
 
 type Shape =
 | Square of int 
-| Rectangle of int * int
\ No newline at end of file
+| Rectangle of int * int
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
index 5133eb737a4..a0fb12976f6 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -9,9 +9,9 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Shape],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (3,5--3,10)),
+                     /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,5--4,10)),
                   Simple
                     (Union
                        (None,
@@ -22,16 +22,16 @@ SigFile
                                  ([], false, None,
                                   LongIdent (SynLongIdent ([int], [], [None])),
                                   false,
-                                  PreXmlDoc ((4,12), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((5,12), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,12--4,15),
+                                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,12--5,15),
                                   { LeadingKeyword = None })],
-                            PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,2--4,15),
+                            /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,2--5,15),
                             { BarRange =
                                Some
-                                 /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,0--4,1) });
+                                 /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,0--5,1) });
                          SynUnionCase
                            ([], SynIdent (Rectangle, None),
                             Fields
@@ -39,40 +39,40 @@ SigFile
                                  ([], false, None,
                                   LongIdent (SynLongIdent ([int], [], [None])),
                                   false,
-                                  PreXmlDoc ((5,15), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((6,15), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,15--5,18),
+                                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (6,15--6,18),
                                   { LeadingKeyword = None });
                                SynField
                                  ([], false, None,
                                   LongIdent (SynLongIdent ([int], [], [None])),
                                   false,
-                                  PreXmlDoc ((5,21), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((6,21), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,21--5,24),
+                                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (6,21--6,24),
                                   { LeadingKeyword = None })],
-                            PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((6,0), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,2--5,24),
+                            /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (6,2--6,24),
                             { BarRange =
                                Some
-                                 /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,0--5,1) })],
-                        /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,0--5,24)),
-                     /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,0--5,24)),
+                                 /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (6,0--6,1) })],
+                        /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,0--6,24)),
+                     /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,0--6,24)),
                   [],
-                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (3,5--5,24),
+                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,5--6,24),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (3,0--3,4)
+                       /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (3,11--3,12)
+                       /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,11--4,12)
                     WithKeyword = None })],
-              /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (3,0--5,24))],
+              /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,0--6,24))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (1,0--5,24),
+          /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (2,0--6,24),
           { LeadingKeyword =
              Namespace
-               /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (1,0--1,9) })],
+               /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs
index 385bb33f61c..3e8ff7cc7e2 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs
@@ -1,2 +1,3 @@
+
 type Foo() =
-    abstract member Bar : int with get,set
\ No newline at end of file
+    abstract member Bar : int with get,set
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
index f07ffcbf1b5..3cbb7010851 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -11,19 +11,19 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                     /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                            /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                          None,
-                         PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                         PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                          { AsKeyword = None });
                       AbstractSlot
                         (SynValSig
@@ -32,17 +32,17 @@ ImplFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,4--2,42),
+                            /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,4--3,42),
                             { LeadingKeyword =
                                AbstractMember
-                                 (/root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,4--2,12),
-                                  /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,13--2,19))
+                                 (/root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,4--3,12),
+                                  /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,13--3,19))
                               InlineKeyword = None
                               WithKeyword =
                                Some
-                                 /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,30--2,34)
+                                 /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,30--3,34)
                               EqualsRange = None }),
                          { IsInstance = true
                            IsDispatchSlot = true
@@ -50,35 +50,35 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGetSet },
-                         /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,4--2,42),
+                         /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,4--3,42),
                          { GetSetKeywords =
                             Some
                               (GetSet
-                                 (/root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,35--2,38),
-                                  /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,39--2,42))) })],
-                     /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,4--2,42)),
+                                 (/root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,35--3,38),
+                                  /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,39--3,42))) })],
+                     /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,4--3,42)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                           /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                         None,
-                        PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                        PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                         { AsKeyword = None })),
-                  /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,5--2,42),
+                  /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,5--3,42),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                       /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,11--1,12)
+                       /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,0--2,42))],
+              /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,0--3,42))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (1,0--2,42),
+          /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs
index df3d7508bc4..8460f0b09dd 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs
@@ -1,3 +1,4 @@
+
 [<MyAttribute>]
 // noDoc
-type A = B
\ No newline at end of file
+type A = B
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
index 5a57721b851..e3e2fc1c86f 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
@@ -14,37 +14,37 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (1,2--1,13))
+                                /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,2--2,13))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (1,2--1,13) }]
+                             /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,2--2,13) }]
                         Range =
-                         /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (1,0--1,15) }],
+                         /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--2,15) }],
                      None, [], [A],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,5--3,6)),
+                     /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,5--4,6)),
                   Simple
                     (TypeAbbrev
                        (Ok, LongIdent (SynLongIdent ([B], [], [None])),
-                        /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,9--3,10)),
-                     /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,9--3,10)),
+                        /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,9--4,10)),
+                     /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,9--4,10)),
                   [], None,
-                  /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (1,0--3,10),
+                  /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--4,10),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,0--3,4)
+                       /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,7--3,8)
+                       /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,7--4,8)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (1,0--3,10))],
+              /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--4,10))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (1,0--3,10),
+          /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--2,8)] },
+            /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,0--3,8)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs
index 7dacaffe108..78032bb2e4f 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs
@@ -1,2 +1,3 @@
+
 type Int32 with
-    member _.Zero = 0
\ No newline at end of file
+    member _.Zero = 0
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
index aa41f6abac0..d15b03bf802 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -11,18 +11,18 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Int32],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,5--1,10)),
+                     /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,5--2,10)),
                   ObjectModel
                     (Augmentation
-                       /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,11--1,15),
+                       /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,11--2,15),
                      [],
-                     /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,5--2,21)),
+                     /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,5--3,21)),
                   [Member
                      (SynBinding
                         (None, Normal, false, false, [],
-                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          SynValData
                            (Some { IsInstance = true
                                    IsDispatchSlot = false
@@ -36,33 +36,33 @@ ImplFile
                          LongIdent
                            (SynLongIdent
                               ([_; Zero],
-                               [/root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,12--2,13)],
+                               [/root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,12--3,13)],
                                [None; None]), None, None, Pats [], None,
-                            /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,11--2,17)),
+                            /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,11--3,17)),
                          None,
                          Const
                            (Int32 0,
-                            /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,20--2,21)),
-                         /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,11--2,17),
+                            /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,20--3,21)),
+                         /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,11--3,17),
                          NoneAtInvisible,
                          { LeadingKeyword =
                             Member
-                              /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,4--2,10)
+                              /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,4--3,10)
                            InlineKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,18--2,19) }),
-                      /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,4--2,21))],
+                              /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,18--3,19) }),
+                      /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,4--3,21))],
                   None,
-                  /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,5--2,21),
+                  /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,5--3,21),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                       /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange = None
                     WithKeyword = None })],
-              /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,0--2,21))],
+              /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,0--3,21))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (1,0--2,21),
+          /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs
index 55272890e2d..97b59c76fd0 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs
@@ -1,4 +1,5 @@
+
 /// mutable class with auto-properties
 type Person(name : string, age : int) =
     /// Full name
-    member val Name = name with get, set
\ No newline at end of file
+    member val Name = name with get, set
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
index a9028bcdd07..793af8031b9 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -11,9 +11,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Person],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,5--2,11)),
+                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,5--3,11)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
@@ -22,19 +22,19 @@ ImplFile
                            ([Typed
                                (Id
                                   (name, None, false, false, false,
-                                   /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,12--2,16)),
+                                   /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,12--3,16)),
                                 LongIdent (SynLongIdent ([string], [], [None])),
-                                /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,12--2,25));
+                                /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,12--3,25));
                              Typed
                                (Id
                                   (age, None, false, false, false,
-                                   /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,27--2,30)),
+                                   /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,27--3,30)),
                                 LongIdent (SynLongIdent ([int], [], [None])),
-                                /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,27--2,36))],
-                            /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,11--2,37)),
+                                /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,27--3,36))],
+                            /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,11--3,37)),
                          None,
-                         PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,5--2,11),
+                         PreXmlDoc ((3,11), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,5--3,11),
                          { AsKeyword = None });
                       AutoProperty
                         ([], false, Name, None, PropertyGetSet,
@@ -50,25 +50,25 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None, Ident name,
-                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,4--4,26),
+                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,4--5,26),
                          { LeadingKeyword =
                             MemberVal
-                              (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,4--4,10),
-                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,11--4,14))
+                              (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,4--5,10),
+                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,11--5,14))
                            WithKeyword =
                             Some
-                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,27--4,31)
+                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,27--5,31)
                            EqualsRange =
                             Some
-                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,20--4,21)
+                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,20--5,21)
                            GetSetKeywords =
                             Some
                               (GetSet
-                                 (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,32--4,35),
-                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,37--4,40))) })],
-                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,4--4,26)),
+                                 (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,32--5,35),
+                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,37--5,40))) })],
+                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,4--5,26)),
                   [],
                   Some
                     (ImplicitCtor
@@ -77,31 +77,31 @@ ImplFile
                           ([Typed
                               (Id
                                  (name, None, false, false, false,
-                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,12--2,16)),
+                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,12--3,16)),
                                LongIdent (SynLongIdent ([string], [], [None])),
-                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,12--2,25));
+                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,12--3,25));
                             Typed
                               (Id
                                  (age, None, false, false, false,
-                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,27--2,30)),
+                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,27--3,30)),
                                LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,27--2,36))],
-                           /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,11--2,37)),
+                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,27--3,36))],
+                           /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,11--3,37)),
                         None,
-                        PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,5--2,11),
+                        PreXmlDoc ((3,11), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,5--3,11),
                         { AsKeyword = None })),
-                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (1,0--4,26),
+                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,0--5,26),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
+                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,0--3,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,38--2,39)
+                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,38--3,39)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (1,0--4,26))],
+              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,0--5,26))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,0--4,40),
+          /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs
index 65bae827ce9..599f6012137 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs
@@ -1,3 +1,4 @@
+
 type Foo() =
     member val AutoProperty = autoProp with get, set
-    member val AutoProperty2 = autoProp
\ No newline at end of file
+    member val AutoProperty2 = autoProp
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
index 6e43759f9e0..c9cddf92196 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -11,19 +11,19 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                            /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                          None,
-                         PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                         PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                          { AsKeyword = None });
                       AutoProperty
                         ([], false, AutoProperty, None, PropertyGetSet,
@@ -39,24 +39,24 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None, Ident autoProp,
-                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,4--2,38),
+                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,4--3,38),
                          { LeadingKeyword =
                             MemberVal
-                              (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,4--2,10),
-                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,11--2,14))
+                              (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,4--3,10),
+                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,11--3,14))
                            WithKeyword =
                             Some
-                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,39--2,43)
+                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,39--3,43)
                            EqualsRange =
                             Some
-                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,28--2,29)
+                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,28--3,29)
                            GetSetKeywords =
                             Some
                               (GetSet
-                                 (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,44--2,47),
-                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,49--2,52))) });
+                                 (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,44--3,47),
+                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,49--3,52))) });
                       AutoProperty
                         ([], false, AutoProperty2, None, Member,
                          { IsInstance = true
@@ -71,41 +71,41 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None, Ident autoProp,
-                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,4--3,39),
+                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (4,4--4,39),
                          { LeadingKeyword =
                             MemberVal
-                              (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,4--3,10),
-                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,11--3,14))
+                              (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (4,4--4,10),
+                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (4,11--4,14))
                            WithKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,29--3,30)
+                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (4,29--4,30)
                            GetSetKeywords = None })],
-                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,4--3,39)),
+                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,4--4,39)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                           /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                         None,
-                        PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                        PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                         { AsKeyword = None })),
-                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,5--3,39),
+                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,5--4,39),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,11--1,12)
+                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,0--3,39))],
+              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,0--4,39))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (1,0--3,39),
+          /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs
index 4013b161636..8cccdc4ae94 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs
@@ -1,3 +1,4 @@
+
 type Bear =
     | BlackBear = 1
-    | PolarBear = 2
\ No newline at end of file
+    | PolarBear = 2
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
index 089d79e3bdf..82e79742031 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -10,49 +10,49 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Bear],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (1,5--1,9)),
+                     /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,5--2,9)),
                   Simple
                     (Enum
                        ([SynEnumCase
                            ([], SynIdent (BlackBear, None),
                             Const
                               (Int32 1,
-                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,18--2,19)),
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,6--2,19),
+                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,18--3,19)),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,6--3,19),
                             { BarRange =
                                Some
-                                 /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,4--2,5)
+                                 /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,4--3,5)
                               EqualsRange =
-                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,16--2,17) });
+                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,16--3,17) });
                          SynEnumCase
                            ([], SynIdent (PolarBear, None),
                             Const
                               (Int32 2,
-                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,18--3,19)),
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,6--3,19),
+                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (4,18--4,19)),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (4,6--4,19),
                             { BarRange =
                                Some
-                                 /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,4--3,5)
+                                 /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (4,4--4,5)
                               EqualsRange =
-                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,16--3,17) })],
-                        /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,4--3,19)),
-                     /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,4--3,19)),
+                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (4,16--4,17) })],
+                        /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,4--4,19)),
+                     /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,4--4,19)),
                   [], None,
-                  /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (1,5--3,19),
+                  /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,5--4,19),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (1,0--1,4)
+                       /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (1,10--1,11)
+                       /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,10--2,11)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (1,0--3,19))],
+              /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,0--4,19))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (1,0--3,19),
+          /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs
index a34936ddb24..381075329a8 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs
@@ -1,3 +1,4 @@
+
 type A =
     /// B
-    member x.B with get() = 5
\ No newline at end of file
+    member x.B with get() = 5
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
index 2d13c6c309a..62d07e195d9 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [A],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (1,5--1,6)),
+                     /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [GetSetMember
@@ -18,7 +18,7 @@ ImplFile
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -33,52 +33,52 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([x; B],
-                                     [/root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,12--3,13)],
+                                     [/root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,12--4,13)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,23--3,25)),
-                                        /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,23--3,25))],
+                                           /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,23--4,25)),
+                                        /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,23--4,25))],
                                   None,
-                                  /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,20--3,25)),
+                                  /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,20--4,25)),
                                None,
                                Const
                                  (Int32 5,
-                                  /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,28--3,29)),
-                               /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,4--3,25),
+                                  /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,28--4,29)),
+                               /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,4--4,25),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,4--3,10)
+                                    /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,26--3,27) })),
+                                    /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,26--4,27) })),
                          None,
-                         /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,4--3,29),
+                         /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,4--4,29),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,15--3,19)
+                            /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,15--4,19)
                            GetKeyword =
                             Some
-                              /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,20--3,23)
+                              /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,20--4,23)
                            AndKeyword = None
                            SetKeyword = None })],
-                     /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,4--3,29)),
+                     /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,4--4,29)),
                   [], None,
-                  /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (1,5--3,29),
+                  /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,5--4,29),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (1,0--1,4)
+                       /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (1,7--1,8)
+                       /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (1,0--3,29))],
+              /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,0--4,29))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (1,0--3,29),
+          /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs
index 1fc8a02804f..ac8471ff188 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs
@@ -1,2 +1,3 @@
+
 type A() =
-    member this.Z with set (_:int):unit = () and get():int = 1
\ No newline at end of file
+    member this.Z with set (_:int):unit = () and get():int = 1
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs.bsl
index c8ef5a47c35..9999060b015 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs.bsl
@@ -8,26 +8,26 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [A],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithMemberWithSetget.fs (1,5--1,6)),
+                     /root/SynTypeDefnWithMemberWithSetget.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/SynTypeDefnWithMemberWithSetget.fs (1,6--1,8)),
+                            /root/SynTypeDefnWithMemberWithSetget.fs (2,6--2,8)),
                          None,
-                         PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynTypeDefnWithMemberWithSetget.fs (1,5--1,6),
+                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynTypeDefnWithMemberWithSetget.fs (2,5--2,6),
                          { AsKeyword = None });
                       GetSetMember
                         (Some
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -42,45 +42,45 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; Z],
-                                     [/root/SynTypeDefnWithMemberWithSetget.fs (2,15--2,16)],
+                                     [/root/SynTypeDefnWithMemberWithSetget.fs (3,15--3,16)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/SynTypeDefnWithMemberWithSetget.fs (2,52--2,54)),
-                                        /root/SynTypeDefnWithMemberWithSetget.fs (2,52--2,54))],
+                                           /root/SynTypeDefnWithMemberWithSetget.fs (3,52--3,54)),
+                                        /root/SynTypeDefnWithMemberWithSetget.fs (3,52--3,54))],
                                   None,
-                                  /root/SynTypeDefnWithMemberWithSetget.fs (2,49--2,54)),
+                                  /root/SynTypeDefnWithMemberWithSetget.fs (3,49--3,54)),
                                Some
                                  (SynBindingReturnInfo
                                     (LongIdent
                                        (SynLongIdent ([int], [], [None])),
-                                     /root/SynTypeDefnWithMemberWithSetget.fs (2,55--2,58),
+                                     /root/SynTypeDefnWithMemberWithSetget.fs (3,55--3,58),
                                      [],
                                      { ColonRange =
                                         Some
-                                          /root/SynTypeDefnWithMemberWithSetget.fs (2,54--2,55) })),
+                                          /root/SynTypeDefnWithMemberWithSetget.fs (3,54--3,55) })),
                                Typed
                                  (Const
                                     (Int32 1,
-                                     /root/SynTypeDefnWithMemberWithSetget.fs (2,61--2,62)),
+                                     /root/SynTypeDefnWithMemberWithSetget.fs (3,61--3,62)),
                                   LongIdent (SynLongIdent ([int], [], [None])),
-                                  /root/SynTypeDefnWithMemberWithSetget.fs (2,61--2,62)),
-                               /root/SynTypeDefnWithMemberWithSetget.fs (2,49--2,54),
+                                  /root/SynTypeDefnWithMemberWithSetget.fs (3,61--3,62)),
+                               /root/SynTypeDefnWithMemberWithSetget.fs (3,49--3,54),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/SynTypeDefnWithMemberWithSetget.fs (2,4--2,10)
+                                    /root/SynTypeDefnWithMemberWithSetget.fs (3,4--3,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/SynTypeDefnWithMemberWithSetget.fs (2,59--2,60) })),
+                                    /root/SynTypeDefnWithMemberWithSetget.fs (3,59--3,60) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -96,76 +96,76 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; Z],
-                                     [/root/SynTypeDefnWithMemberWithSetget.fs (2,15--2,16)],
+                                     [/root/SynTypeDefnWithMemberWithSetget.fs (3,15--3,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Typed
                                           (Wild
-                                             /root/SynTypeDefnWithMemberWithSetget.fs (2,28--2,29),
+                                             /root/SynTypeDefnWithMemberWithSetget.fs (3,28--3,29),
                                            LongIdent
                                              (SynLongIdent ([int], [], [None])),
-                                           /root/SynTypeDefnWithMemberWithSetget.fs (2,28--2,33)),
-                                        /root/SynTypeDefnWithMemberWithSetget.fs (2,27--2,34))],
+                                           /root/SynTypeDefnWithMemberWithSetget.fs (3,28--3,33)),
+                                        /root/SynTypeDefnWithMemberWithSetget.fs (3,27--3,34))],
                                   None,
-                                  /root/SynTypeDefnWithMemberWithSetget.fs (2,23--2,34)),
+                                  /root/SynTypeDefnWithMemberWithSetget.fs (3,23--3,34)),
                                Some
                                  (SynBindingReturnInfo
                                     (LongIdent
                                        (SynLongIdent ([unit], [], [None])),
-                                     /root/SynTypeDefnWithMemberWithSetget.fs (2,35--2,39),
+                                     /root/SynTypeDefnWithMemberWithSetget.fs (3,35--3,39),
                                      [],
                                      { ColonRange =
                                         Some
-                                          /root/SynTypeDefnWithMemberWithSetget.fs (2,34--2,35) })),
+                                          /root/SynTypeDefnWithMemberWithSetget.fs (3,34--3,35) })),
                                Typed
                                  (Const
                                     (Unit,
-                                     /root/SynTypeDefnWithMemberWithSetget.fs (2,42--2,44)),
+                                     /root/SynTypeDefnWithMemberWithSetget.fs (3,42--3,44)),
                                   LongIdent (SynLongIdent ([unit], [], [None])),
-                                  /root/SynTypeDefnWithMemberWithSetget.fs (2,42--2,44)),
-                               /root/SynTypeDefnWithMemberWithSetget.fs (2,23--2,34),
+                                  /root/SynTypeDefnWithMemberWithSetget.fs (3,42--3,44)),
+                               /root/SynTypeDefnWithMemberWithSetget.fs (3,23--3,34),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/SynTypeDefnWithMemberWithSetget.fs (2,4--2,10)
+                                    /root/SynTypeDefnWithMemberWithSetget.fs (3,4--3,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/SynTypeDefnWithMemberWithSetget.fs (2,40--2,41) })),
-                         /root/SynTypeDefnWithMemberWithSetget.fs (2,4--2,62),
+                                    /root/SynTypeDefnWithMemberWithSetget.fs (3,40--3,41) })),
+                         /root/SynTypeDefnWithMemberWithSetget.fs (3,4--3,62),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/SynTypeDefnWithMemberWithSetget.fs (2,18--2,22)
+                            /root/SynTypeDefnWithMemberWithSetget.fs (3,18--3,22)
                            GetKeyword =
                             Some
-                              /root/SynTypeDefnWithMemberWithSetget.fs (2,49--2,52)
+                              /root/SynTypeDefnWithMemberWithSetget.fs (3,49--3,52)
                            AndKeyword =
                             Some
-                              /root/SynTypeDefnWithMemberWithSetget.fs (2,45--2,48)
+                              /root/SynTypeDefnWithMemberWithSetget.fs (3,45--3,48)
                            SetKeyword =
                             Some
-                              /root/SynTypeDefnWithMemberWithSetget.fs (2,23--2,26) })],
-                     /root/SynTypeDefnWithMemberWithSetget.fs (2,4--2,62)), [],
+                              /root/SynTypeDefnWithMemberWithSetget.fs (3,23--3,26) })],
+                     /root/SynTypeDefnWithMemberWithSetget.fs (3,4--3,62)), [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/SynTypeDefnWithMemberWithSetget.fs (1,6--1,8)),
+                           /root/SynTypeDefnWithMemberWithSetget.fs (2,6--2,8)),
                         None,
-                        PreXmlDoc ((1,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynTypeDefnWithMemberWithSetget.fs (1,5--1,6),
+                        PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynTypeDefnWithMemberWithSetget.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/SynTypeDefnWithMemberWithSetget.fs (1,5--2,62),
+                  /root/SynTypeDefnWithMemberWithSetget.fs (2,5--3,62),
                   { LeadingKeyword =
-                     Type /root/SynTypeDefnWithMemberWithSetget.fs (1,0--1,4)
+                     Type /root/SynTypeDefnWithMemberWithSetget.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/SynTypeDefnWithMemberWithSetget.fs (1,9--1,10)
+                     Some /root/SynTypeDefnWithMemberWithSetget.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithMemberWithSetget.fs (1,0--2,62))],
+              /root/SynTypeDefnWithMemberWithSetget.fs (2,0--3,62))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithMemberWithSetget.fs (1,0--2,62),
+          /root/SynTypeDefnWithMemberWithSetget.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs
index 78b0a64be18..9adae91b8b7 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs
@@ -1,3 +1,4 @@
+
 type Foobar () =
     class
-    end
\ No newline at end of file
+    end
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
index 2e0537c6a72..e47439e2e89 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -11,43 +11,43 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foobar],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,5--1,11)),
+                     /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,5--2,11)),
                   ObjectModel
                     (Class,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,12--1,14)),
+                            /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,12--2,14)),
                          None,
-                         PreXmlDoc ((1,12), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,5--1,11),
+                         PreXmlDoc ((2,12), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,5--2,11),
                          { AsKeyword = None })],
-                     /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,4--3,7)),
+                     /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (3,4--4,7)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,12--1,14)),
+                           /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,12--2,14)),
                         None,
-                        PreXmlDoc ((1,12), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,5--1,11),
+                        PreXmlDoc ((2,12), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,5--2,11),
                         { AsKeyword = None })),
-                  /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,5--3,7),
+                  /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,5--4,7),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,0--1,4)
+                       /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,15--1,16)
+                       /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,15--2,16)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,0--3,7))],
+              /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,0--4,7))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (1,0--3,7),
+          /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs
index b9036b34530..41e20304b92 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs
@@ -1 +1,2 @@
-type X = delegate of string -> string
\ No newline at end of file
+
+type X = delegate of string -> string
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
index d8987408ffe..0f4279be52e 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -12,17 +12,17 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,5--1,6)),
+                     /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,5--2,6)),
                   ObjectModel
                     (Delegate
                        (Fun
                           (LongIdent (SynLongIdent ([string], [], [None])),
                            LongIdent (SynLongIdent ([string], [], [None])),
-                           /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,21--1,37),
+                           /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,21--2,37),
                            { ArrowRange =
-                              /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,28--1,30) }),
+                              /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,28--2,30) }),
                         SynValInfo
                           ([[SynArgInfo ([], false, None)]],
                            SynArgInfo ([], false, None))),
@@ -33,14 +33,14 @@ ImplFile
                             Fun
                               (LongIdent (SynLongIdent ([string], [], [None])),
                                LongIdent (SynLongIdent ([string], [], [None])),
-                               /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,21--1,37),
+                               /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,21--2,37),
                                { ArrowRange =
-                                  /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,28--1,30) }),
+                                  /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,28--2,30) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]],
                                SynArgInfo ([], false, None)), false, false,
                             PreXmlDocEmpty, None, None,
-                            /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,9--1,37),
+                            /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,9--2,37),
                             { LeadingKeyword = Synthetic
                               InlineKeyword = None
                               WithKeyword = None
@@ -51,21 +51,21 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,9--1,37),
+                         /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,9--2,37),
                          { GetSetKeywords = None })],
-                     /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,9--1,37)),
+                     /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,9--2,37)),
                   [], None,
-                  /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,5--1,37),
+                  /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,5--2,37),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,0--1,4)
+                       /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,7--1,8)
+                       /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,0--1,37))],
+              /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,0--2,37))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (1,0--1,37),
+          /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs
index 766eb008203..042587d3a06 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs
@@ -1,4 +1,5 @@
+
 type Foo =
     { Bar : int }
     with
-        member this.Meh (v:int) = this.Bar + v
\ No newline at end of file
+        member this.Meh (v:int) = this.Bar + v
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
index 3d972a4fe73..428f5164613 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -10,25 +10,25 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                     /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   Simple
                     (Record
                        (None,
                         [SynField
                            ([], false, Some Bar,
                             LongIdent (SynLongIdent ([int], [], [None])), false,
-                            PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,6), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,6--2,15),
+                            /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (3,6--3,15),
                             { LeadingKeyword = None })],
-                        /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,4--2,17)),
-                     /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,4--2,17)),
+                        /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (3,4--3,17)),
+                     /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (3,4--3,17)),
                   [Member
                      (SynBinding
                         (None, Normal, false, false, [],
-                         PreXmlDoc ((4,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((5,8), FSharp.Compiler.Xml.XmlDocCollector),
                          SynValData
                            (Some { IsInstance = true
                                    IsDispatchSlot = false
@@ -43,20 +43,20 @@ ImplFile
                          LongIdent
                            (SynLongIdent
                               ([this; Meh],
-                               [/root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,19--4,20)],
+                               [/root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,19--5,20)],
                                [None; None]), None, None,
                             Pats
                               [Paren
                                  (Typed
                                     (Named
                                        (SynIdent (v, None), false, None,
-                                        /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,25--4,26)),
+                                        /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,25--5,26)),
                                      LongIdent
                                        (SynLongIdent ([int], [], [None])),
-                                     /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,25--4,30)),
-                                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,24--4,31))],
+                                     /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,25--5,30)),
+                                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,24--5,31))],
                             None,
-                            /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,15--4,31)),
+                            /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,15--5,31)),
                          None,
                          App
                            (NonAtomic, false,
@@ -67,41 +67,41 @@ ImplFile
                                   SynLongIdent
                                     ([op_Addition], [],
                                      [Some (OriginalNotation "+")]), None,
-                                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,43--4,44)),
+                                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,43--5,44)),
                                LongIdent
                                  (false,
                                   SynLongIdent
                                     ([this; Bar],
-                                     [/root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,38--4,39)],
+                                     [/root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,38--5,39)],
                                      [None; None]), None,
-                                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,34--4,42)),
-                               /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,34--4,44)),
+                                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,34--5,42)),
+                               /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,34--5,44)),
                             Ident v,
-                            /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,34--4,46)),
-                         /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,15--4,31),
+                            /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,34--5,46)),
+                         /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,15--5,31),
                          NoneAtInvisible,
                          { LeadingKeyword =
                             Member
-                              /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,8--4,14)
+                              /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,8--5,14)
                            InlineKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,32--4,33) }),
-                      /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,8--4,46))],
+                              /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,32--5,33) }),
+                      /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,8--5,46))],
                   None,
-                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (1,5--4,46),
+                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,5--5,46),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                       /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (1,9--1,10)
+                       /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,9--2,10)
                     WithKeyword =
                      Some
-                       /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (3,4--3,8) })],
-              /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (1,0--4,46))],
+                       /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,4--4,8) })],
+              /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,0--5,46))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (1,0--4,46),
+          /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs
index eab4128caa9..02b35e27497 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs
@@ -1,4 +1,5 @@
+
 type Foo =
     static member ReadWrite2 
         with set  x = lastUsed <- ("ReadWrite2", x)
-        and  get () = lastUsed <- ("ReadWrite2", 0); 4
\ No newline at end of file
+        and  get () = lastUsed <- ("ReadWrite2", 0); 4
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
index 63710bdcf9f..bdeea7a54dc 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (1,5--1,8)),
+                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [GetSetMember
@@ -18,7 +18,7 @@ ImplFile
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = false
@@ -36,10 +36,10 @@ ImplFile
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,17--4,19)),
-                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,17--4,19))],
+                                           /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,17--5,19)),
+                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,17--5,19))],
                                   None,
-                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,19)),
+                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,13--5,19)),
                                None,
                                Sequential
                                  (SuppressNeither, true,
@@ -51,37 +51,37 @@ ImplFile
                                            [Const
                                               (String
                                                  ("ReadWrite2", Regular,
-                                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,47)),
-                                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,47));
+                                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,35--5,47)),
+                                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,35--5,47));
                                             Const
                                               (Int32 0,
-                                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,49--4,50))],
-                                           [/root/SynTypeDefnWithStaticMemberWithGetset.fs (4,47--4,48)],
-                                           /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,50)),
-                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,34--4,35),
+                                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,49--5,50))],
+                                           [/root/SynTypeDefnWithStaticMemberWithGetset.fs (5,47--5,48)],
+                                           /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,35--5,50)),
+                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,34--5,35),
                                         Some
-                                          /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,50--4,51),
-                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,34--4,51)),
-                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,22--4,51)),
+                                          /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,50--5,51),
+                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,34--5,51)),
+                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,22--5,51)),
                                   Const
                                     (Int32 4,
-                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,53--4,54)),
-                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,22--4,54)),
-                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,19),
+                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,53--5,54)),
+                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,22--5,54)),
+                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,13--5,19),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   StaticMember
-                                    (/root/SynTypeDefnWithStaticMemberWithGetset.fs (2,4--2,10),
-                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,11--2,17))
+                                    (/root/SynTypeDefnWithStaticMemberWithGetset.fs (3,4--3,10),
+                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,11--3,17))
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,20--4,21) })),
+                                    /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,20--5,21) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = false
@@ -99,9 +99,9 @@ ImplFile
                                   Pats
                                     [Named
                                        (SynIdent (x, None), false, None,
-                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,18--3,19))],
+                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,18--4,19))],
                                   None,
-                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,13--3,19)),
+                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,19)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([lastUsed], [], [None]),
@@ -111,52 +111,52 @@ ImplFile
                                         [Const
                                            (String
                                               ("ReadWrite2", Regular,
-                                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,35--3,47)),
-                                            /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,35--3,47));
+                                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,47)),
+                                            /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,47));
                                          Ident x],
-                                        [/root/SynTypeDefnWithStaticMemberWithGetset.fs (3,47--3,48)],
-                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,35--3,50)),
-                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,34--3,35),
+                                        [/root/SynTypeDefnWithStaticMemberWithGetset.fs (4,47--4,48)],
+                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,50)),
+                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,34--4,35),
                                      Some
-                                       /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,50--3,51),
-                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,34--3,51)),
-                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,22--3,51)),
-                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,13--3,19),
+                                       /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,50--4,51),
+                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,34--4,51)),
+                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,22--4,51)),
+                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,19),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   StaticMember
-                                    (/root/SynTypeDefnWithStaticMemberWithGetset.fs (2,4--2,10),
-                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,11--2,17))
+                                    (/root/SynTypeDefnWithStaticMemberWithGetset.fs (3,4--3,10),
+                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,11--3,17))
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,20--3,21) })),
-                         /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,4--4,54),
+                                    /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,20--4,21) })),
+                         /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,4--5,54),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,8--3,12)
+                            /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,8--4,12)
                            GetKeyword =
                             Some
-                              /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,16)
+                              /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,13--5,16)
                            AndKeyword =
                             Some
-                              /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,8--4,11)
+                              /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,8--5,11)
                            SetKeyword =
                             Some
-                              /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,13--3,16) })],
-                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,4--4,54)),
+                              /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,16) })],
+                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,4--5,54)),
                   [], None,
-                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (1,5--4,54),
+                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,5--5,54),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithStaticMemberWithGetset.fs (1,0--1,4)
+                       /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithStaticMemberWithGetset.fs (1,9--1,10)
+                       /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithStaticMemberWithGetset.fs (1,0--4,54))],
+              /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,0--5,54))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithStaticMemberWithGetset.fs (1,0--4,54),
+          /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs
index f3a8d261e8f..91a02ddff40 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs
@@ -1,3 +1,4 @@
+
 type Shape =
     | Square of int 
-    | Rectangle of int * int
\ No newline at end of file
+    | Rectangle of int * int
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
index 28ef63a62a7..fe2dff1220e 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -10,9 +10,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Shape],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (1,5--1,10)),
+                     /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,5--2,10)),
                   Simple
                     (Union
                        (None,
@@ -23,16 +23,16 @@ ImplFile
                                  ([], false, None,
                                   LongIdent (SynLongIdent ([int], [], [None])),
                                   false,
-                                  PreXmlDoc ((2,16), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((3,16), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,16--2,19),
+                                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,16--3,19),
                                   { LeadingKeyword = None })],
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,6--2,19),
+                            /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,6--3,19),
                             { BarRange =
                                Some
-                                 /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,4--2,5) });
+                                 /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,4--3,5) });
                          SynUnionCase
                            ([], SynIdent (Rectangle, None),
                             Fields
@@ -40,38 +40,38 @@ ImplFile
                                  ([], false, None,
                                   LongIdent (SynLongIdent ([int], [], [None])),
                                   false,
-                                  PreXmlDoc ((3,19), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((4,19), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,19--3,22),
+                                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (4,19--4,22),
                                   { LeadingKeyword = None });
                                SynField
                                  ([], false, None,
                                   LongIdent (SynLongIdent ([int], [], [None])),
                                   false,
-                                  PreXmlDoc ((3,25), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((4,25), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,25--3,28),
+                                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (4,25--4,28),
                                   { LeadingKeyword = None })],
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,6--3,28),
+                            /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (4,6--4,28),
                             { BarRange =
                                Some
-                                 /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,4--3,5) })],
-                        /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,4--3,28)),
-                     /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,4--3,28)),
+                                 /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (4,4--4,5) })],
+                        /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,4--4,28)),
+                     /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,4--4,28)),
                   [], None,
-                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (1,5--3,28),
+                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,5--4,28),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (1,0--1,4)
+                       /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (1,11--1,12)
+                       /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (1,0--3,28))],
+              /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,0--4,28))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (1,0--3,28),
+          /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs b/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs
index e5a2833cf93..ef876e38bdb 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs
@@ -1,4 +1,5 @@
+
 /// Doc
 // noDoc
 type A = B
-and C = D
\ No newline at end of file
+and C = D
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
index cf7d5fabaa9..c171cecd282 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
@@ -10,49 +10,49 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [A],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,5--3,6)),
+                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,5--4,6)),
                   Simple
                     (TypeAbbrev
                        (Ok, LongIdent (SynLongIdent ([B], [], [None])),
-                        /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,9--3,10)),
-                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,9--3,10)),
+                        /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,9--4,10)),
+                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,9--4,10)),
                   [], None,
-                  /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (1,0--3,10),
+                  /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (2,0--4,10),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,0--3,4)
+                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,7--3,8)
+                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,7--4,8)
                     WithKeyword = None });
                SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [C],
-                     PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,4--4,5)),
+                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,4--5,5)),
                   Simple
                     (TypeAbbrev
                        (Ok, LongIdent (SynLongIdent ([D], [], [None])),
-                        /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,8--4,9)),
-                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,8--4,9)),
+                        /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,8--5,9)),
+                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,8--5,9)),
                   [], None,
-                  /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,4--4,9),
+                  /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,4--5,9),
                   { LeadingKeyword =
                      And
-                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,0--4,3)
+                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,0--5,3)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,6--4,7)
+                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,6--5,7)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (1,0--4,9))],
+              /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (2,0--5,9))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,0--4,9),
+          /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (2,0--2,8)] },
+            /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,0--3,8)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs b/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs
index 1b2df9575a8..92b6fe0f85b 100644
--- a/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs
+++ b/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs
@@ -1,2 +1,3 @@
+
 type X = string -> // after a tuple, mixed needs an indent 
-                 int
\ No newline at end of file
+                 int
diff --git a/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs.bsl b/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs.bsl
index e9c7c3480eb..0204b552f23 100644
--- a/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs.bsl
@@ -8,28 +8,28 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/SynTypeFunHasRangeOfArrow.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/SynTypeFunHasRangeOfArrow.fs (2,5--2,6)),
                   Simple
                     (TypeAbbrev
                        (Ok,
                         Fun
                           (LongIdent (SynLongIdent ([string], [], [None])),
                            LongIdent (SynLongIdent ([int], [], [None])),
-                           /root/SynTypeFunHasRangeOfArrow.fs (1,9--2,20),
+                           /root/SynTypeFunHasRangeOfArrow.fs (2,9--3,20),
                            { ArrowRange =
-                              /root/SynTypeFunHasRangeOfArrow.fs (1,16--1,18) }),
-                        /root/SynTypeFunHasRangeOfArrow.fs (1,9--2,20)),
-                     /root/SynTypeFunHasRangeOfArrow.fs (1,9--2,20)), [], None,
-                  /root/SynTypeFunHasRangeOfArrow.fs (1,5--2,20),
+                              /root/SynTypeFunHasRangeOfArrow.fs (2,16--2,18) }),
+                        /root/SynTypeFunHasRangeOfArrow.fs (2,9--3,20)),
+                     /root/SynTypeFunHasRangeOfArrow.fs (2,9--3,20)), [], None,
+                  /root/SynTypeFunHasRangeOfArrow.fs (2,5--3,20),
                   { LeadingKeyword =
-                     Type /root/SynTypeFunHasRangeOfArrow.fs (1,0--1,4)
+                     Type /root/SynTypeFunHasRangeOfArrow.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/SynTypeFunHasRangeOfArrow.fs (1,7--1,8)
+                     Some /root/SynTypeFunHasRangeOfArrow.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/SynTypeFunHasRangeOfArrow.fs (1,0--2,20))], PreXmlDocEmpty,
-          [], None, /root/SynTypeFunHasRangeOfArrow.fs (1,0--2,20),
+              /root/SynTypeFunHasRangeOfArrow.fs (2,0--3,20))], PreXmlDocEmpty,
+          [], None, /root/SynTypeFunHasRangeOfArrow.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/SynTypeFunHasRangeOfArrow.fs (1,19--1,59)] }, set []))
\ No newline at end of file
+         [LineComment /root/SynTypeFunHasRangeOfArrow.fs (2,19--2,59)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs b/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs
index 022a3808958..4eb9a02a38b 100644
--- a/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs
+++ b/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs
@@ -1 +1,2 @@
-let inline (!!) (x: ^a) : ^b = ((^a or ^b): (static member op_Implicit: ^a -> ^b) x)
\ No newline at end of file
+
+let inline (!!) (x: ^a) : ^b = ((^a or ^b): (static member op_Implicit: ^a -> ^b) x)
diff --git a/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs.bsl
index d672af35da5..2be4e1656bc 100644
--- a/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, true, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -19,32 +19,32 @@ ImplFile
                        ([op_BangBang], [],
                         [Some
                            (OriginalNotationWithParen
-                              (/root/SynTypeOrInsideSynExprTraitCall.fs (1,11--1,12),
+                              (/root/SynTypeOrInsideSynExprTraitCall.fs (2,11--2,12),
                                "!!",
-                               /root/SynTypeOrInsideSynExprTraitCall.fs (1,14--1,15)))]),
+                               /root/SynTypeOrInsideSynExprTraitCall.fs (2,14--2,15)))]),
                      None, None,
                      Pats
                        [Paren
                           (Typed
                              (Named
                                 (SynIdent (x, None), false, None,
-                                 /root/SynTypeOrInsideSynExprTraitCall.fs (1,17--1,18)),
+                                 /root/SynTypeOrInsideSynExprTraitCall.fs (2,17--2,18)),
                               Var
                                 (SynTypar (a, HeadType, false),
-                                 /root/SynTypeOrInsideSynExprTraitCall.fs (1,20--1,22)),
-                              /root/SynTypeOrInsideSynExprTraitCall.fs (1,17--1,22)),
-                           /root/SynTypeOrInsideSynExprTraitCall.fs (1,16--1,23))],
-                     None, /root/SynTypeOrInsideSynExprTraitCall.fs (1,11--1,23)),
+                                 /root/SynTypeOrInsideSynExprTraitCall.fs (2,20--2,22)),
+                              /root/SynTypeOrInsideSynExprTraitCall.fs (2,17--2,22)),
+                           /root/SynTypeOrInsideSynExprTraitCall.fs (2,16--2,23))],
+                     None, /root/SynTypeOrInsideSynExprTraitCall.fs (2,11--2,23)),
                   Some
                     (SynBindingReturnInfo
                        (Var
                           (SynTypar (b, HeadType, false),
-                           /root/SynTypeOrInsideSynExprTraitCall.fs (1,26--1,28)),
-                        /root/SynTypeOrInsideSynExprTraitCall.fs (1,26--1,28),
+                           /root/SynTypeOrInsideSynExprTraitCall.fs (2,26--2,28)),
+                        /root/SynTypeOrInsideSynExprTraitCall.fs (2,26--2,28),
                         [],
                         { ColonRange =
                            Some
-                             /root/SynTypeOrInsideSynExprTraitCall.fs (1,24--1,25) })),
+                             /root/SynTypeOrInsideSynExprTraitCall.fs (2,24--2,25) })),
                   Typed
                     (Paren
                        (TraitCall
@@ -52,14 +52,14 @@ ImplFile
                              (Or
                                 (Var
                                    (SynTypar (a, HeadType, false),
-                                    /root/SynTypeOrInsideSynExprTraitCall.fs (1,33--1,35)),
+                                    /root/SynTypeOrInsideSynExprTraitCall.fs (2,33--2,35)),
                                  Var
                                    (SynTypar (b, HeadType, false),
-                                    /root/SynTypeOrInsideSynExprTraitCall.fs (1,39--1,41)),
-                                 /root/SynTypeOrInsideSynExprTraitCall.fs (1,33--1,41),
+                                    /root/SynTypeOrInsideSynExprTraitCall.fs (2,39--2,41)),
+                                 /root/SynTypeOrInsideSynExprTraitCall.fs (2,33--2,41),
                                  { OrKeyword =
-                                    /root/SynTypeOrInsideSynExprTraitCall.fs (1,36--1,38) }),
-                              /root/SynTypeOrInsideSynExprTraitCall.fs (1,32--1,42)),
+                                    /root/SynTypeOrInsideSynExprTraitCall.fs (2,36--2,38) }),
+                              /root/SynTypeOrInsideSynExprTraitCall.fs (2,32--2,42)),
                            Member
                              (SynValSig
                                 ([], SynIdent (op_Implicit, None),
@@ -67,23 +67,23 @@ ImplFile
                                  Fun
                                    (Var
                                       (SynTypar (a, HeadType, false),
-                                       /root/SynTypeOrInsideSynExprTraitCall.fs (1,72--1,74)),
+                                       /root/SynTypeOrInsideSynExprTraitCall.fs (2,72--2,74)),
                                     Var
                                       (SynTypar (b, HeadType, false),
-                                       /root/SynTypeOrInsideSynExprTraitCall.fs (1,78--1,80)),
-                                    /root/SynTypeOrInsideSynExprTraitCall.fs (1,72--1,80),
+                                       /root/SynTypeOrInsideSynExprTraitCall.fs (2,78--2,80)),
+                                    /root/SynTypeOrInsideSynExprTraitCall.fs (2,72--2,80),
                                     { ArrowRange =
-                                       /root/SynTypeOrInsideSynExprTraitCall.fs (1,75--1,77) }),
+                                       /root/SynTypeOrInsideSynExprTraitCall.fs (2,75--2,77) }),
                                  SynValInfo
                                    ([[SynArgInfo ([], false, None)]],
                                     SynArgInfo ([], false, None)), false, false,
-                                 PreXmlDoc ((1,45), FSharp.Compiler.Xml.XmlDocCollector),
+                                 PreXmlDoc ((2,45), FSharp.Compiler.Xml.XmlDocCollector),
                                  None, None,
-                                 /root/SynTypeOrInsideSynExprTraitCall.fs (1,45--1,80),
+                                 /root/SynTypeOrInsideSynExprTraitCall.fs (2,45--2,80),
                                  { LeadingKeyword =
                                     StaticMember
-                                      (/root/SynTypeOrInsideSynExprTraitCall.fs (1,45--1,51),
-                                       /root/SynTypeOrInsideSynExprTraitCall.fs (1,52--1,58))
+                                      (/root/SynTypeOrInsideSynExprTraitCall.fs (2,45--2,51),
+                                       /root/SynTypeOrInsideSynExprTraitCall.fs (2,52--2,58))
                                    InlineKeyword = None
                                    WithKeyword = None
                                    EqualsRange = None }),
@@ -93,28 +93,28 @@ ImplFile
                                 IsFinal = false
                                 GetterOrSetterIsCompilerGenerated = false
                                 MemberKind = Member },
-                              /root/SynTypeOrInsideSynExprTraitCall.fs (1,45--1,80),
+                              /root/SynTypeOrInsideSynExprTraitCall.fs (2,45--2,80),
                               { GetSetKeywords = None }), Ident x,
-                           /root/SynTypeOrInsideSynExprTraitCall.fs (1,31--1,84)),
-                        /root/SynTypeOrInsideSynExprTraitCall.fs (1,31--1,32),
+                           /root/SynTypeOrInsideSynExprTraitCall.fs (2,31--2,84)),
+                        /root/SynTypeOrInsideSynExprTraitCall.fs (2,31--2,32),
                         Some
-                          /root/SynTypeOrInsideSynExprTraitCall.fs (1,83--1,84),
-                        /root/SynTypeOrInsideSynExprTraitCall.fs (1,31--1,84)),
+                          /root/SynTypeOrInsideSynExprTraitCall.fs (2,83--2,84),
+                        /root/SynTypeOrInsideSynExprTraitCall.fs (2,31--2,84)),
                      Var
                        (SynTypar (b, HeadType, false),
-                        /root/SynTypeOrInsideSynExprTraitCall.fs (1,26--1,28)),
-                     /root/SynTypeOrInsideSynExprTraitCall.fs (1,31--1,84)),
-                  /root/SynTypeOrInsideSynExprTraitCall.fs (1,11--1,23),
+                        /root/SynTypeOrInsideSynExprTraitCall.fs (2,26--2,28)),
+                     /root/SynTypeOrInsideSynExprTraitCall.fs (2,31--2,84)),
+                  /root/SynTypeOrInsideSynExprTraitCall.fs (2,11--2,23),
                   NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/SynTypeOrInsideSynExprTraitCall.fs (1,0--1,3)
+                     Let /root/SynTypeOrInsideSynExprTraitCall.fs (2,0--2,3)
                     InlineKeyword =
-                     Some /root/SynTypeOrInsideSynExprTraitCall.fs (1,4--1,10)
+                     Some /root/SynTypeOrInsideSynExprTraitCall.fs (2,4--2,10)
                     EqualsRange =
-                     Some /root/SynTypeOrInsideSynExprTraitCall.fs (1,29--1,30) })],
-              /root/SynTypeOrInsideSynExprTraitCall.fs (1,0--1,84))],
+                     Some /root/SynTypeOrInsideSynExprTraitCall.fs (2,29--2,30) })],
+              /root/SynTypeOrInsideSynExprTraitCall.fs (2,0--2,84))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeOrInsideSynExprTraitCall.fs (1,0--1,84),
+          /root/SynTypeOrInsideSynExprTraitCall.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs b/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs
index cedd590ee53..efd95432f88 100644
--- a/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs
+++ b/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs
@@ -1,2 +1,3 @@
+
 let inline f_StaticMethod<'T1, 'T2 when ('T1 or 'T2) : (static member StaticMethod: int -> int) >() : int = 
-    ()
\ No newline at end of file
+    ()
diff --git a/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl b/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
index 0b36b6556d9..fb4823f7721 100644
--- a/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
@@ -10,7 +10,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, true, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None),
                   LongIdent
@@ -26,14 +26,14 @@ ImplFile
                                        (Or
                                           (Var
                                              (SynTypar (T1, None, false),
-                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,41--1,44)),
+                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,41--2,44)),
                                            Var
                                              (SynTypar (T2, None, false),
-                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,48--1,51)),
-                                           /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,41--1,51),
+                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,48--2,51)),
+                                           /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,41--2,51),
                                            { OrKeyword =
-                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,45--1,47) }),
-                                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,40--1,52)),
+                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,45--2,47) }),
+                                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,40--2,52)),
                                      Member
                                        (SynValSig
                                           ([], SynIdent (StaticMethod, None),
@@ -45,20 +45,20 @@ ImplFile
                                               LongIdent
                                                 (SynLongIdent
                                                    ([int], [], [None])),
-                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,84--1,94),
+                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,84--2,94),
                                               { ArrowRange =
-                                                 /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,88--1,90) }),
+                                                 /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,88--2,90) }),
                                            SynValInfo
                                              ([[SynArgInfo ([], false, None)]],
                                               SynArgInfo ([], false, None)),
                                            false, false,
-                                           PreXmlDoc ((1,56), FSharp.Compiler.Xml.XmlDocCollector),
+                                           PreXmlDoc ((2,56), FSharp.Compiler.Xml.XmlDocCollector),
                                            None, None,
-                                           /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,56--1,94),
+                                           /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,56--2,94),
                                            { LeadingKeyword =
                                               StaticMember
-                                                (/root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,56--1,62),
-                                                 /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,63--1,69))
+                                                (/root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,56--2,62),
+                                                 /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,63--2,69))
                                              InlineKeyword = None
                                              WithKeyword = None
                                              EqualsRange = None }),
@@ -69,47 +69,47 @@ ImplFile
                                           GetterOrSetterIsCompilerGenerated =
                                            false
                                           MemberKind = Member },
-                                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,56--1,94),
+                                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,56--2,94),
                                         { GetSetKeywords = None }),
-                                     /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,40--1,95))],
-                                 /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,25--1,97))),
+                                     /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,40--2,95))],
+                                 /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,25--2,97))),
                            false)),
                      Pats
                        [Paren
                           (Const
                              (Unit,
-                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,97--1,99)),
-                           /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,97--1,99))],
+                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,97--2,99)),
+                           /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,97--2,99))],
                      None,
-                     /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,11--1,99)),
+                     /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,11--2,99)),
                   Some
                     (SynBindingReturnInfo
                        (LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,102--1,105),
+                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,102--2,105),
                         [],
                         { ColonRange =
                            Some
-                             /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,100--1,101) })),
+                             /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,100--2,101) })),
                   Typed
                     (Const
                        (Unit,
-                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,4--2,6)),
+                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (3,4--3,6)),
                      LongIdent (SynLongIdent ([int], [], [None])),
-                     /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,4--2,6)),
-                  /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,11--1,99),
+                     /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (3,4--3,6)),
+                  /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,11--2,99),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,0--1,3)
+                       /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,0--2,3)
                     InlineKeyword =
                      Some
-                       /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,4--1,10)
+                       /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,4--2,10)
                     EqualsRange =
                      Some
-                       /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,106--1,107) })],
-              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,0--2,6))],
+                       /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,106--2,107) })],
+              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,0--3,6))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (1,0--2,6),
+          /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs b/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs
index b5f12bcdeaa..e7c06dfdb81 100644
--- a/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs
+++ b/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs
@@ -1 +1,2 @@
-let inline f (x: 'T) = ((^T or int) : (static member A: int) ())
\ No newline at end of file
+
+let inline f (x: 'T) = ((^T or int) : (static member A: int) ())
diff --git a/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl b/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
index 544bb79273a..027d93cc6dc 100644
--- a/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
@@ -8,7 +8,7 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, true, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None,
                      SynValInfo
@@ -21,14 +21,14 @@ ImplFile
                           (Typed
                              (Named
                                 (SynIdent (x, None), false, None,
-                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,14--1,15)),
+                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,14--2,15)),
                               Var
                                 (SynTypar (T, None, false),
-                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,17--1,19)),
-                              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,14--1,19)),
-                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,13--1,20))],
+                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,17--2,19)),
+                              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,14--2,19)),
+                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,13--2,20))],
                      None,
-                     /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,11--1,20)),
+                     /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,11--2,20)),
                   None,
                   Paren
                     (TraitCall
@@ -36,12 +36,12 @@ ImplFile
                           (Or
                              (Var
                                 (SynTypar (T, HeadType, false),
-                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,25--1,27)),
+                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,25--2,27)),
                               LongIdent (SynLongIdent ([int], [], [None])),
-                              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,25--1,34),
+                              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,25--2,34),
                               { OrKeyword =
-                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,28--1,30) }),
-                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,24--1,35)),
+                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,28--2,30) }),
+                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,24--2,35)),
                         Member
                           (SynValSig
                              ([], SynIdent (A, None),
@@ -49,13 +49,13 @@ ImplFile
                               LongIdent (SynLongIdent ([int], [], [None])),
                               SynValInfo ([], SynArgInfo ([], false, None)),
                               false, false,
-                              PreXmlDoc ((1,39), FSharp.Compiler.Xml.XmlDocCollector),
+                              PreXmlDoc ((2,39), FSharp.Compiler.Xml.XmlDocCollector),
                               None, None,
-                              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,39--1,59),
+                              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,39--2,59),
                               { LeadingKeyword =
                                  StaticMember
-                                   (/root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,39--1,45),
-                                    /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,46--1,52))
+                                   (/root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,39--2,45),
+                                    /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,46--2,52))
                                 InlineKeyword = None
                                 WithKeyword = None
                                 EqualsRange = None }),
@@ -65,30 +65,30 @@ ImplFile
                              IsFinal = false
                              GetterOrSetterIsCompilerGenerated = false
                              MemberKind = PropertyGet },
-                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,39--1,59),
+                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,39--2,59),
                            { GetSetKeywords = None }),
                         Const
                           (Unit,
-                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,61--1,63)),
-                        /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,23--1,64)),
-                     /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,23--1,24),
+                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,61--2,63)),
+                        /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,23--2,64)),
+                     /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,23--2,24),
                      Some
-                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,63--1,64),
-                     /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,23--1,64)),
-                  /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,11--1,20),
+                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,63--2,64),
+                     /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,23--2,64)),
+                  /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,11--2,20),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,0--1,3)
+                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,0--2,3)
                     InlineKeyword =
                      Some
-                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,4--1,10)
+                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,4--2,10)
                     EqualsRange =
                      Some
-                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,21--1,22) })],
-              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,0--1,64))],
+                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,21--2,22) })],
+              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,0--2,64))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (1,0--1,64),
+          /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi
index 672fc8e01a5..8e3aca95f03 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi
+++ b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi
@@ -1,2 +1,3 @@
+
 type T =
-    member M: [<SomeAttribute>] a * [<OtherAttribute>] b -> int
\ No newline at end of file
+    member M: [<SomeAttribute>] a * [<OtherAttribute>] b -> int
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
index db6542b8b42..9df8bca65c0 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
@@ -9,9 +9,9 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [T],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (1,5--1,6)),
+                     /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -30,19 +30,19 @@ SigFile
                                                 ArgExpr =
                                                  Const
                                                    (Unit,
-                                                    /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,16--2,29))
+                                                    /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,16--3,29))
                                                 Target = None
                                                 AppliesToGetterAndSetter = false
                                                 Range =
-                                                 /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,16--2,29) }]
+                                                 /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,16--3,29) }]
                                             Range =
-                                             /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,14--2,31) }],
+                                             /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,31) }],
                                          false, None,
                                          LongIdent
                                            (SynLongIdent ([a], [], [None])),
-                                         /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,14--2,33)));
+                                         /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,33)));
                                    Star
-                                     /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,34--2,35);
+                                     /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,34--3,35);
                                    Type
                                      (SignatureParameter
                                         ([{ Attributes =
@@ -52,22 +52,22 @@ SigFile
                                                 ArgExpr =
                                                  Const
                                                    (Unit,
-                                                    /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,38--2,52))
+                                                    /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,38--3,52))
                                                 Target = None
                                                 AppliesToGetterAndSetter = false
                                                 Range =
-                                                 /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,38--2,52) }]
+                                                 /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,38--3,52) }]
                                             Range =
-                                             /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,36--2,54) }],
+                                             /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,36--3,54) }],
                                          false, None,
                                          LongIdent
                                            (SynLongIdent ([b], [], [None])),
-                                         /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,36--2,56)))],
-                                  /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,14--2,56)),
+                                         /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,36--3,56)))],
+                                  /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,56)),
                                LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,14--2,63),
+                               /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,63),
                                { ArrowRange =
-                                  /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,57--2,59) }),
+                                  /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,57--3,59) }),
                             SynValInfo
                               ([[SynArgInfo
                                    ([{ Attributes =
@@ -77,13 +77,13 @@ SigFile
                                            ArgExpr =
                                             Const
                                               (Unit,
-                                               /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,16--2,29))
+                                               /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,16--3,29))
                                            Target = None
                                            AppliesToGetterAndSetter = false
                                            Range =
-                                            /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,16--2,29) }]
+                                            /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,16--3,29) }]
                                        Range =
-                                        /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,14--2,31) }],
+                                        /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,31) }],
                                     false, None);
                                  SynArgInfo
                                    ([{ Attributes =
@@ -93,21 +93,21 @@ SigFile
                                            ArgExpr =
                                             Const
                                               (Unit,
-                                               /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,38--2,52))
+                                               /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,38--3,52))
                                            Target = None
                                            AppliesToGetterAndSetter = false
                                            Range =
-                                            /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,38--2,52) }]
+                                            /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,38--3,52) }]
                                        Range =
-                                        /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,36--2,54) }],
+                                        /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,36--3,54) }],
                                     false, None)]], SynArgInfo ([], false, None)),
                             false, false,
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,4--2,63),
+                            /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,4--3,63),
                             { LeadingKeyword =
                                Member
-                                 /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,4--2,10)
+                                 /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,4--3,10)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -117,20 +117,20 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,4--2,63),
+                         /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,4--3,63),
                          { GetSetKeywords = None })],
-                     /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,4--2,63)),
+                     /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,4--3,63)),
                   [],
-                  /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (1,5--2,63),
+                  /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,5--3,63),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (1,0--1,4)
+                       /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (1,7--1,8)
+                       /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,7--2,8)
                     WithKeyword = None })],
-              /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (1,0--2,63))],
+              /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,0--3,63))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (1,0--2,63),
+          /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,0--4,0),
           { LeadingKeyword = None })], { ConditionalDirectives = []
                                          CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi
index a86030c46a0..34af7706b1a 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi
+++ b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi
@@ -1,2 +1,3 @@
+
 type T =
-    member M: p1: a * p2: b -> int
\ No newline at end of file
+    member M: p1: a * p2: b -> int
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
index ee04489da46..01721ead8b0 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
@@ -8,9 +8,9 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [T],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (1,5--1,6)),
+                     /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -25,30 +25,30 @@ SigFile
                                         ([], false, Some p1,
                                          LongIdent
                                            (SynLongIdent ([a], [], [None])),
-                                         /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,14--2,19)));
+                                         /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,14--3,19)));
                                    Star
-                                     /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,20--2,21);
+                                     /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,20--3,21);
                                    Type
                                      (SignatureParameter
                                         ([], false, Some p2,
                                          LongIdent
                                            (SynLongIdent ([b], [], [None])),
-                                         /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,22--2,27)))],
-                                  /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,14--2,27)),
+                                         /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,22--3,27)))],
+                                  /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,14--3,27)),
                                LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,14--2,34),
+                               /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,14--3,34),
                                { ArrowRange =
-                                  /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,28--2,30) }),
+                                  /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,28--3,30) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, Some p1);
                                  SynArgInfo ([], false, Some p2)]],
                                SynArgInfo ([], false, None)), false, false,
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,4--2,34),
+                            /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,4--3,34),
                             { LeadingKeyword =
                                Member
-                                 /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,4--2,10)
+                                 /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,4--3,10)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -58,20 +58,20 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,4--2,34),
+                         /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,4--3,34),
                          { GetSetKeywords = None })],
-                     /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,4--2,34)),
+                     /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,4--3,34)),
                   [],
-                  /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (1,5--2,34),
+                  /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,5--3,34),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (1,0--1,4)
+                       /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (1,7--1,8)
+                       /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,7--2,8)
                     WithKeyword = None })],
-              /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (1,0--2,34))],
+              /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,0--3,34))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (1,0--2,34),
+          /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,0--4,0),
           { LeadingKeyword = None })], { ConditionalDirectives = []
                                          CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs
index 8246778c867..27bbf055077 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs
+++ b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs
@@ -1 +1,2 @@
-[<Measure>] type X = / second
\ No newline at end of file
+
+[<Measure>] type X = / second
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
index fdd840c0414..b4c0166a70b 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
@@ -12,41 +12,41 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,2--1,9))
+                                /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,2--2,9))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,2--1,9) }]
+                             /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,2--2,9) }]
                         Range =
-                         /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,0--1,11) }],
+                         /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,0--2,11) }],
                      None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,17--1,18)),
+                     /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,17--2,18)),
                   Simple
                     (TypeAbbrev
                        (Ok,
                         Tuple
                           (false,
                            [Slash
-                              /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,21--1,22);
+                              /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,21--2,22);
                             Type
                               (LongIdent (SynLongIdent ([second], [], [None])))],
-                           /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,21--1,29)),
-                        /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,21--1,29)),
-                     /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,21--1,29)),
+                           /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,21--2,29)),
+                        /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,21--2,29)),
+                     /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,21--2,29)),
                   [], None,
-                  /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,0--1,29),
+                  /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,0--2,29),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,12--1,16)
+                       /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,12--2,16)
                     EqualsRange =
                      Some
-                       /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,19--1,20)
+                       /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,19--2,20)
                     WithKeyword = None })],
-              /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,0--1,29))],
+              /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,0--2,29))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (1,0--1,29),
+          /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs
index 08356c5ac29..9d2561f5acb 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs
+++ b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs
@@ -1 +1,2 @@
-[<Measure>] type X = Y * Z
\ No newline at end of file
+
+[<Measure>] type X = Y * Z
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
index 56d321120d9..9c26ef711ff 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
@@ -12,17 +12,17 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,2--1,9))
+                                /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,2--2,9))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,2--1,9) }]
+                             /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,2--2,9) }]
                         Range =
-                         /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,0--1,11) }],
+                         /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,0--2,11) }],
                      None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,17--1,18)),
+                     /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,17--2,18)),
                   Simple
                     (TypeAbbrev
                        (Ok,
@@ -30,23 +30,23 @@ ImplFile
                           (false,
                            [Type (LongIdent (SynLongIdent ([Y], [], [None])));
                             Star
-                              /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,23--1,24);
+                              /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,23--2,24);
                             Type (LongIdent (SynLongIdent ([Z], [], [None])))],
-                           /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,21--1,26)),
-                        /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,21--1,26)),
-                     /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,21--1,26)),
+                           /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,21--2,26)),
+                        /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,21--2,26)),
+                     /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,21--2,26)),
                   [], None,
-                  /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,0--1,26),
+                  /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,0--2,26),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,12--1,16)
+                       /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,12--2,16)
                     EqualsRange =
                      Some
-                       /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,19--1,20)
+                       /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,19--2,20)
                     WithKeyword = None })],
-              /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,0--1,26))],
+              /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,0--2,26))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (1,0--1,26),
+          /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs
index dc96983c185..c1b617ede06 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs
+++ b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs
@@ -1 +1,2 @@
-[<Measure>] type R = X * Y / Z
\ No newline at end of file
+
+[<Measure>] type R = X * Y / Z
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
index 18fc0379e8d..19a93b85980 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
@@ -12,17 +12,17 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,2--1,9))
+                                /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,2--2,9))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,2--1,9) }]
+                             /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,2--2,9) }]
                         Range =
-                         /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,0--1,11) }],
+                         /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,0--2,11) }],
                      None, [], [R],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,17--1,18)),
+                     /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,17--2,18)),
                   Simple
                     (TypeAbbrev
                        (Ok,
@@ -30,26 +30,26 @@ ImplFile
                           (false,
                            [Type (LongIdent (SynLongIdent ([X], [], [None])));
                             Star
-                              /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,23--1,24);
+                              /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,23--2,24);
                             Type (LongIdent (SynLongIdent ([Y], [], [None])));
                             Slash
-                              /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,27--1,28);
+                              /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,27--2,28);
                             Type (LongIdent (SynLongIdent ([Z], [], [None])))],
-                           /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,21--1,30)),
-                        /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,21--1,30)),
-                     /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,21--1,30)),
+                           /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,21--2,30)),
+                        /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,21--2,30)),
+                     /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,21--2,30)),
                   [], None,
-                  /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,0--1,30),
+                  /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,0--2,30),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,12--1,16)
+                       /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,12--2,16)
                     EqualsRange =
                      Some
-                       /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,19--1,20)
+                       /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,19--2,20)
                     WithKeyword = None })],
-              /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,0--1,30))],
+              /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,0--2,30))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (1,0--1,30),
+          /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs
index ffc7c0c813b..741c7f33fef 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs
+++ b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs
@@ -1 +1,2 @@
-let _: struct (int * int = ()
\ No newline at end of file
+
+let _: struct (int * int = ()
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs.bsl b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs.bsl
index 11bb09a1064..e5761114482 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs.bsl
@@ -8,45 +8,45 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Wild /root/SynTypeTupleWithStruct,Recovery.fs (1,4--1,5),
+                  Wild /root/SynTypeTupleWithStruct,Recovery.fs (2,4--2,5),
                   Some
                     (SynBindingReturnInfo
                        (Tuple
                           (true,
                            [Type (LongIdent (SynLongIdent ([int], [], [None])));
                             Star
-                              /root/SynTypeTupleWithStruct,Recovery.fs (1,19--1,20);
+                              /root/SynTypeTupleWithStruct,Recovery.fs (2,19--2,20);
                             Type (LongIdent (SynLongIdent ([int], [], [None])))],
-                           /root/SynTypeTupleWithStruct,Recovery.fs (1,7--1,24)),
-                        /root/SynTypeTupleWithStruct,Recovery.fs (1,7--1,26), [],
+                           /root/SynTypeTupleWithStruct,Recovery.fs (2,7--2,24)),
+                        /root/SynTypeTupleWithStruct,Recovery.fs (2,7--2,26), [],
                         { ColonRange =
                            Some
-                             /root/SynTypeTupleWithStruct,Recovery.fs (1,5--1,6) })),
+                             /root/SynTypeTupleWithStruct,Recovery.fs (2,5--2,6) })),
                   Typed
                     (Const
                        (Unit,
-                        /root/SynTypeTupleWithStruct,Recovery.fs (1,27--1,29)),
+                        /root/SynTypeTupleWithStruct,Recovery.fs (2,27--2,29)),
                      Tuple
                        (true,
                         [Type (LongIdent (SynLongIdent ([int], [], [None])));
                          Star
-                           /root/SynTypeTupleWithStruct,Recovery.fs (1,19--1,20);
+                           /root/SynTypeTupleWithStruct,Recovery.fs (2,19--2,20);
                          Type (LongIdent (SynLongIdent ([int], [], [None])))],
-                        /root/SynTypeTupleWithStruct,Recovery.fs (1,7--1,24)),
-                     /root/SynTypeTupleWithStruct,Recovery.fs (1,27--1,29)),
-                  /root/SynTypeTupleWithStruct,Recovery.fs (1,4--1,5),
-                  Yes /root/SynTypeTupleWithStruct,Recovery.fs (1,0--1,29),
+                        /root/SynTypeTupleWithStruct,Recovery.fs (2,7--2,24)),
+                     /root/SynTypeTupleWithStruct,Recovery.fs (2,27--2,29)),
+                  /root/SynTypeTupleWithStruct,Recovery.fs (2,4--2,5),
+                  Yes /root/SynTypeTupleWithStruct,Recovery.fs (2,0--2,29),
                   { LeadingKeyword =
-                     Let /root/SynTypeTupleWithStruct,Recovery.fs (1,0--1,3)
+                     Let /root/SynTypeTupleWithStruct,Recovery.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
-                     Some /root/SynTypeTupleWithStruct,Recovery.fs (1,25--1,26) })],
-              /root/SynTypeTupleWithStruct,Recovery.fs (1,0--1,29))],
+                     Some /root/SynTypeTupleWithStruct,Recovery.fs (2,25--2,26) })],
+              /root/SynTypeTupleWithStruct,Recovery.fs (2,0--2,29))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeTupleWithStruct,Recovery.fs (1,0--1,29),
+          /root/SynTypeTupleWithStruct,Recovery.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs
index fbd0e72cd44..57da7704318 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs
+++ b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs
@@ -1 +1,2 @@
-let _: struct (int * int) = ()
\ No newline at end of file
+
+let _: struct (int * int) = ()
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs.bsl b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs.bsl
index c94f3fd47e8..7ba5c5e1f67 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs.bsl
@@ -8,39 +8,39 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Wild /root/SynTypeTupleWithStruct.fs (1,4--1,5),
+                  Wild /root/SynTypeTupleWithStruct.fs (2,4--2,5),
                   Some
                     (SynBindingReturnInfo
                        (Tuple
                           (true,
                            [Type (LongIdent (SynLongIdent ([int], [], [None])));
-                            Star /root/SynTypeTupleWithStruct.fs (1,19--1,20);
+                            Star /root/SynTypeTupleWithStruct.fs (2,19--2,20);
                             Type (LongIdent (SynLongIdent ([int], [], [None])))],
-                           /root/SynTypeTupleWithStruct.fs (1,7--1,25)),
-                        /root/SynTypeTupleWithStruct.fs (1,7--1,25), [],
+                           /root/SynTypeTupleWithStruct.fs (2,7--2,25)),
+                        /root/SynTypeTupleWithStruct.fs (2,7--2,25), [],
                         { ColonRange =
-                           Some /root/SynTypeTupleWithStruct.fs (1,5--1,6) })),
+                           Some /root/SynTypeTupleWithStruct.fs (2,5--2,6) })),
                   Typed
-                    (Const (Unit, /root/SynTypeTupleWithStruct.fs (1,28--1,30)),
+                    (Const (Unit, /root/SynTypeTupleWithStruct.fs (2,28--2,30)),
                      Tuple
                        (true,
                         [Type (LongIdent (SynLongIdent ([int], [], [None])));
-                         Star /root/SynTypeTupleWithStruct.fs (1,19--1,20);
+                         Star /root/SynTypeTupleWithStruct.fs (2,19--2,20);
                          Type (LongIdent (SynLongIdent ([int], [], [None])))],
-                        /root/SynTypeTupleWithStruct.fs (1,7--1,25)),
-                     /root/SynTypeTupleWithStruct.fs (1,28--1,30)),
-                  /root/SynTypeTupleWithStruct.fs (1,4--1,5),
-                  Yes /root/SynTypeTupleWithStruct.fs (1,0--1,30),
+                        /root/SynTypeTupleWithStruct.fs (2,7--2,25)),
+                     /root/SynTypeTupleWithStruct.fs (2,28--2,30)),
+                  /root/SynTypeTupleWithStruct.fs (2,4--2,5),
+                  Yes /root/SynTypeTupleWithStruct.fs (2,0--2,30),
                   { LeadingKeyword =
-                     Let /root/SynTypeTupleWithStruct.fs (1,0--1,3)
+                     Let /root/SynTypeTupleWithStruct.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
-                     Some /root/SynTypeTupleWithStruct.fs (1,26--1,27) })],
-              /root/SynTypeTupleWithStruct.fs (1,0--1,30))], PreXmlDocEmpty, [],
-          None, /root/SynTypeTupleWithStruct.fs (1,0--1,30),
+                     Some /root/SynTypeTupleWithStruct.fs (2,26--2,27) })],
+              /root/SynTypeTupleWithStruct.fs (2,0--2,30))], PreXmlDocEmpty, [],
+          None, /root/SynTypeTupleWithStruct.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs b/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs
index 28980e9554d..cc4164c021f 100644
--- a/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs
+++ b/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs
@@ -1,2 +1,3 @@
+
 type X =
-    | a: int * z:int
\ No newline at end of file
+    | a: int * z:int
diff --git a/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs.bsl b/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs.bsl
index c2cacc436db..bb58f4d07cd 100644
--- a/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs.bsl
@@ -8,8 +8,8 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/SynUnionCaseKindFullType.fs (1,5--1,6)),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/SynUnionCaseKindFullType.fs (2,5--2,6)),
                   Simple
                     (Union
                        (None,
@@ -22,29 +22,29 @@ ImplFile
                                      (LongIdent
                                         (SynLongIdent ([int], [], [None])));
                                    Star
-                                     /root/SynUnionCaseKindFullType.fs (2,13--2,14);
+                                     /root/SynUnionCaseKindFullType.fs (3,13--3,14);
                                    Type
                                      (SignatureParameter
                                         ([], false, Some z,
                                          LongIdent
                                            (SynLongIdent ([int], [], [None])),
-                                         /root/SynUnionCaseKindFullType.fs (2,15--2,20)))],
-                                  /root/SynUnionCaseKindFullType.fs (2,9--2,20)),
+                                         /root/SynUnionCaseKindFullType.fs (3,15--3,20)))],
+                                  /root/SynUnionCaseKindFullType.fs (3,9--3,20)),
                                SynValInfo ([], SynArgInfo ([], false, None))),
-                            PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            None, /root/SynUnionCaseKindFullType.fs (2,6--2,20),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, /root/SynUnionCaseKindFullType.fs (3,6--3,20),
                             { BarRange =
-                               Some /root/SynUnionCaseKindFullType.fs (2,4--2,5) })],
-                        /root/SynUnionCaseKindFullType.fs (2,4--2,20)),
-                     /root/SynUnionCaseKindFullType.fs (2,4--2,20)), [], None,
-                  /root/SynUnionCaseKindFullType.fs (1,5--2,20),
+                               Some /root/SynUnionCaseKindFullType.fs (3,4--3,5) })],
+                        /root/SynUnionCaseKindFullType.fs (3,4--3,20)),
+                     /root/SynUnionCaseKindFullType.fs (3,4--3,20)), [], None,
+                  /root/SynUnionCaseKindFullType.fs (2,5--3,20),
                   { LeadingKeyword =
-                     Type /root/SynUnionCaseKindFullType.fs (1,0--1,4)
+                     Type /root/SynUnionCaseKindFullType.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/SynUnionCaseKindFullType.fs (1,7--1,8)
+                     Some /root/SynUnionCaseKindFullType.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/SynUnionCaseKindFullType.fs (1,0--2,20))], PreXmlDocEmpty,
-          [], None, /root/SynUnionCaseKindFullType.fs (1,0--2,20),
+              /root/SynUnionCaseKindFullType.fs (2,0--3,20))], PreXmlDocEmpty,
+          [], None, /root/SynUnionCaseKindFullType.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi b/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi
index c8e443d4d95..d058e8e8d08 100644
--- a/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi
+++ b/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi
@@ -1,5 +1,6 @@
+
 module Meh
 val InferSynValData:
     memberFlagsOpt: SynMemberFlags option * pat: SynPat option * SynReturnInfo option * origRhsExpr: SynExpr ->
         x: string ->
-            SynValData2
\ No newline at end of file
+            SynValData2
diff --git a/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi.bsl b/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi.bsl
index 97b2ff3fdea..ee7926108ad 100644
--- a/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi.bsl
@@ -20,10 +20,10 @@ SigFile
                                  [LongIdent
                                     (SynLongIdent ([SynMemberFlags], [], [None]))],
                                  [], None, true,
-                                 /root/SynValSigContainsParameterNames.fsi (3,20--3,41)),
-                              /root/SynValSigContainsParameterNames.fsi (3,4--3,41)));
+                                 /root/SynValSigContainsParameterNames.fsi (4,20--4,41)),
+                              /root/SynValSigContainsParameterNames.fsi (4,4--4,41)));
                         Star
-                          /root/SynValSigContainsParameterNames.fsi (3,42--3,43);
+                          /root/SynValSigContainsParameterNames.fsi (4,42--4,43);
                         Type
                           (SignatureParameter
                              ([], false, Some pat,
@@ -33,10 +33,10 @@ SigFile
                                  [LongIdent
                                     (SynLongIdent ([SynPat], [], [None]))], [],
                                  None, true,
-                                 /root/SynValSigContainsParameterNames.fsi (3,49--3,62)),
-                              /root/SynValSigContainsParameterNames.fsi (3,44--3,62)));
+                                 /root/SynValSigContainsParameterNames.fsi (4,49--4,62)),
+                              /root/SynValSigContainsParameterNames.fsi (4,44--4,62)));
                         Star
-                          /root/SynValSigContainsParameterNames.fsi (3,63--3,64);
+                          /root/SynValSigContainsParameterNames.fsi (4,63--4,64);
                         Type
                           (App
                              (LongIdent (SynLongIdent ([option], [], [None])),
@@ -44,27 +44,27 @@ SigFile
                               [LongIdent
                                  (SynLongIdent ([SynReturnInfo], [], [None]))],
                               [], None, true,
-                              /root/SynValSigContainsParameterNames.fsi (3,65--3,85)));
+                              /root/SynValSigContainsParameterNames.fsi (4,65--4,85)));
                         Star
-                          /root/SynValSigContainsParameterNames.fsi (3,86--3,87);
+                          /root/SynValSigContainsParameterNames.fsi (4,86--4,87);
                         Type
                           (SignatureParameter
                              ([], false, Some origRhsExpr,
                               LongIdent (SynLongIdent ([SynExpr], [], [None])),
-                              /root/SynValSigContainsParameterNames.fsi (3,88--3,108)))],
-                       /root/SynValSigContainsParameterNames.fsi (3,4--3,108)),
+                              /root/SynValSigContainsParameterNames.fsi (4,88--4,108)))],
+                       /root/SynValSigContainsParameterNames.fsi (4,4--4,108)),
                     Fun
                       (SignatureParameter
                          ([], false, Some x,
                           LongIdent (SynLongIdent ([string], [], [None])),
-                          /root/SynValSigContainsParameterNames.fsi (4,8--4,17)),
+                          /root/SynValSigContainsParameterNames.fsi (5,8--5,17)),
                        LongIdent (SynLongIdent ([SynValData2], [], [None])),
-                       /root/SynValSigContainsParameterNames.fsi (4,8--5,23),
+                       /root/SynValSigContainsParameterNames.fsi (5,8--6,23),
                        { ArrowRange =
-                          /root/SynValSigContainsParameterNames.fsi (4,18--4,20) }),
-                    /root/SynValSigContainsParameterNames.fsi (3,4--5,23),
+                          /root/SynValSigContainsParameterNames.fsi (5,18--5,20) }),
+                    /root/SynValSigContainsParameterNames.fsi (4,4--6,23),
                     { ArrowRange =
-                       /root/SynValSigContainsParameterNames.fsi (3,109--3,111) }),
+                       /root/SynValSigContainsParameterNames.fsi (4,109--4,111) }),
                  SynValInfo
                    ([[SynArgInfo ([], false, Some memberFlagsOpt);
                       SynArgInfo ([], false, Some pat);
@@ -72,17 +72,17 @@ SigFile
                       SynArgInfo ([], false, Some origRhsExpr)];
                      [SynArgInfo ([], false, Some x)]],
                     SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 None, /root/SynValSigContainsParameterNames.fsi (2,0--5,23),
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None, /root/SynValSigContainsParameterNames.fsi (3,0--6,23),
                  { LeadingKeyword =
-                    Val /root/SynValSigContainsParameterNames.fsi (2,0--2,3)
+                    Val /root/SynValSigContainsParameterNames.fsi (3,0--3,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/SynValSigContainsParameterNames.fsi (2,0--5,23))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/SynValSigContainsParameterNames.fsi (1,0--5,23),
+              /root/SynValSigContainsParameterNames.fsi (3,0--6,23))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/SynValSigContainsParameterNames.fsi (2,0--6,23),
           { LeadingKeyword =
-             Module /root/SynValSigContainsParameterNames.fsi (1,0--1,6) })],
+             Module /root/SynValSigContainsParameterNames.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SyntheticKeyword.fs b/tests/service/data/SyntaxTree/SyntheticKeyword.fs
index 4165b212a57..2aa18fcd8e8 100644
--- a/tests/service/data/SyntaxTree/SyntheticKeyword.fs
+++ b/tests/service/data/SyntaxTree/SyntheticKeyword.fs
@@ -1,2 +1,3 @@
+
 { new ISomething with
-    a = () }
\ No newline at end of file
+    a = () }
diff --git a/tests/service/data/SyntaxTree/SyntheticKeyword.fs.bsl b/tests/service/data/SyntaxTree/SyntheticKeyword.fs.bsl
index a8ac909694c..9e12f033b89 100644
--- a/tests/service/data/SyntaxTree/SyntheticKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/SyntheticKeyword.fs.bsl
@@ -7,7 +7,7 @@ ImplFile
           [Expr
              (ObjExpr
                 (LongIdent (SynLongIdent ([ISomething], [], [None])), None,
-                 Some /root/SyntheticKeyword.fs (1,17--1,21),
+                 Some /root/SyntheticKeyword.fs (2,17--2,21),
                  [SynBinding
                     (None, Normal, false, false, [], PreXmlDocEmpty,
                      SynValData
@@ -15,16 +15,16 @@ ImplFile
                         None),
                      Named
                        (SynIdent (a, None), false, None,
-                        /root/SyntheticKeyword.fs (2,4--2,5)), None,
-                     Const (Unit, /root/SyntheticKeyword.fs (2,8--2,10)),
-                     /root/SyntheticKeyword.fs (2,4--2,5),
-                     Yes /root/SyntheticKeyword.fs (2,8--2,10),
+                        /root/SyntheticKeyword.fs (3,4--3,5)), None,
+                     Const (Unit, /root/SyntheticKeyword.fs (3,8--3,10)),
+                     /root/SyntheticKeyword.fs (3,4--3,5),
+                     Yes /root/SyntheticKeyword.fs (3,8--3,10),
                      { LeadingKeyword = Synthetic
                        InlineKeyword = None
-                       EqualsRange = Some /root/SyntheticKeyword.fs (2,6--2,7) })],
-                 [], [], /root/SyntheticKeyword.fs (1,2--1,16),
-                 /root/SyntheticKeyword.fs (1,0--2,12)),
-              /root/SyntheticKeyword.fs (1,0--2,12))], PreXmlDocEmpty, [], None,
-          /root/SyntheticKeyword.fs (1,0--2,12), { LeadingKeyword = None })],
+                       EqualsRange = Some /root/SyntheticKeyword.fs (3,6--3,7) })],
+                 [], [], /root/SyntheticKeyword.fs (2,2--2,16),
+                 /root/SyntheticKeyword.fs (2,0--3,12)),
+              /root/SyntheticKeyword.fs (2,0--3,12))], PreXmlDocEmpty, [], None,
+          /root/SyntheticKeyword.fs (2,0--3,12), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs b/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs
index 82b92088432..3125fdc0109 100644
--- a/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs
+++ b/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs
@@ -1 +1,2 @@
-#nowarn \"\"\"40\"\"\"
\ No newline at end of file
+
+#nowarn \"\"\"40\"\"\"
diff --git a/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
index 2e851f972d5..50988fb214b 100644
--- a/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
+++ b/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
@@ -7,10 +7,10 @@ ImplFile
           [HashDirective
              (ParsedHashDirective
                 ("nowarn", [],
-                 /root/TripleQuoteStringAsParsedHashDirectiveArgument.fs (1,0--1,7)),
-              /root/TripleQuoteStringAsParsedHashDirectiveArgument.fs (1,0--1,9))],
+                 /root/TripleQuoteStringAsParsedHashDirectiveArgument.fs (2,0--2,7)),
+              /root/TripleQuoteStringAsParsedHashDirectiveArgument.fs (2,0--2,9))],
           PreXmlDocEmpty, [], None,
-          /root/TripleQuoteStringAsParsedHashDirectiveArgument.fs (1,0--1,9),
+          /root/TripleQuoteStringAsParsedHashDirectiveArgument.fs (2,0--2,9),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs b/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs
index ec5ed382d1a..a0fcd0bd363 100644
--- a/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs
+++ b/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs
@@ -1,3 +1,4 @@
+
 /// Valid xml doc
 let x =
     /// Some great documentation comment
@@ -5,4 +6,4 @@ let x =
     /// With a blank line in between
     /// but on a while loop
     while true do ()
-    a + 1
\ No newline at end of file
+    a + 1
diff --git a/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs.bsl b/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs.bsl
index d5d7a4e79b2..599b6b97a9d 100644
--- a/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs.bsl
+++ b/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs.bsl
@@ -11,25 +11,25 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (x, None), false, None,
-                     /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (2,4--2,5)),
+                     /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (3,4--3,5)),
                   None,
                   Sequential
                     (SuppressNeither, true,
                      While
                        (Yes
-                          /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (7,4--7,14),
+                          /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,4--8,14),
                         Const
                           (Bool true,
-                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (7,10--7,14)),
+                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,10--8,14)),
                         Const
                           (Unit,
-                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (7,18--7,20)),
-                        /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (7,4--7,20)),
+                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,18--8,20)),
+                        /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,4--8,20)),
                      App
                        (NonAtomic, false,
                         App
@@ -39,33 +39,33 @@ ImplFile
                               SynLongIdent
                                 ([op_Addition], [],
                                  [Some (OriginalNotation "+")]), None,
-                              /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,6--8,7)),
+                              /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (9,6--9,7)),
                            Ident a,
-                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,4--8,7)),
+                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (9,4--9,7)),
                         Const
                           (Int32 1,
-                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,8--8,9)),
-                        /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,4--8,9)),
-                     /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (7,4--8,9)),
-                  /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (1,0--2,5),
+                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (9,8--9,9)),
+                        /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (9,4--9,9)),
+                     /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,4--9,9)),
+                  /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (2,0--3,5),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (2,0--2,3)
+                       /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (3,0--3,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (2,6--2,7) })],
-              /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (1,0--8,9))],
+                       /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (3,6--3,7) })],
+              /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (2,0--9,9))],
           PreXmlDocEmpty, [], None,
-          /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (2,0--8,9),
+          /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (3,0--10,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (3,4--3,40);
+            /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (4,4--4,40);
           LineComment
-            /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (5,4--5,36);
+            /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (6,4--6,36);
           LineComment
-            /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (6,4--6,27)] },
+            /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (7,4--7,27)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs b/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs
index 730b937bfb7..c73196b361b 100644
--- a/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs
+++ b/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs
@@ -1,2 +1,3 @@
+
 /// Some great documentation comment
-let x = 0
\ No newline at end of file
+let x = 0
diff --git a/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs.bsl b/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs.bsl
index 66ec51c062c..4f7beb0e2e5 100644
--- a/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs.bsl
+++ b/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs.bsl
@@ -8,28 +8,28 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (x, None), false, None,
-                     /root/TripleSlashCommentShouldNotBeCaptured.fs (2,4--2,5)),
+                     /root/TripleSlashCommentShouldNotBeCaptured.fs (3,4--3,5)),
                   None,
                   Const
                     (Int32 0,
-                     /root/TripleSlashCommentShouldNotBeCaptured.fs (2,8--2,9)),
-                  /root/TripleSlashCommentShouldNotBeCaptured.fs (1,0--2,5),
-                  Yes /root/TripleSlashCommentShouldNotBeCaptured.fs (2,0--2,9),
+                     /root/TripleSlashCommentShouldNotBeCaptured.fs (3,8--3,9)),
+                  /root/TripleSlashCommentShouldNotBeCaptured.fs (2,0--3,5),
+                  Yes /root/TripleSlashCommentShouldNotBeCaptured.fs (3,0--3,9),
                   { LeadingKeyword =
                      Let
-                       /root/TripleSlashCommentShouldNotBeCaptured.fs (2,0--2,3)
+                       /root/TripleSlashCommentShouldNotBeCaptured.fs (3,0--3,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/TripleSlashCommentShouldNotBeCaptured.fs (2,6--2,7) })],
-              /root/TripleSlashCommentShouldNotBeCaptured.fs (1,0--2,9))],
+                       /root/TripleSlashCommentShouldNotBeCaptured.fs (3,6--3,7) })],
+              /root/TripleSlashCommentShouldNotBeCaptured.fs (2,0--3,9))],
           PreXmlDocEmpty, [], None,
-          /root/TripleSlashCommentShouldNotBeCaptured.fs (2,0--2,9),
+          /root/TripleSlashCommentShouldNotBeCaptured.fs (3,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi b/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi
index 1d75e9444a1..a16c27246ab 100644
--- a/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi
+++ b/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi
@@ -1,3 +1,4 @@
+
 module Meh
 
 type X =
@@ -11,4 +12,4 @@ type Y = int
 #endif
 
 type Z with
-    static member P : int -> int
\ No newline at end of file
+    static member P : int -> int
diff --git a/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi.bsl b/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
index 96c68686c76..e27c467fe0c 100644
--- a/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
@@ -8,9 +8,9 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [X],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (3,5--3,6)),
+                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -20,86 +20,86 @@ SigFile
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
                             Some
                               (Const
                                  (Int32 10,
-                                  /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,21--4,23))),
-                            /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,4--4,23),
+                                  /root/TriviaIsPresentInSynTypeDefnSig.fsi (5,21--5,23))),
+                            /root/TriviaIsPresentInSynTypeDefnSig.fsi (5,4--5,23),
                             { LeadingKeyword =
                                Member
-                                 /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,4--4,10)
+                                 /root/TriviaIsPresentInSynTypeDefnSig.fsi (5,4--5,10)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange =
                                Some
-                                 /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,19--4,20) }),
+                                 /root/TriviaIsPresentInSynTypeDefnSig.fsi (5,19--5,20) }),
                          { IsInstance = true
                            IsDispatchSlot = false
                            IsOverrideOrExplicitImpl = false
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,4--4,23),
+                         /root/TriviaIsPresentInSynTypeDefnSig.fsi (5,4--5,23),
                          { GetSetKeywords = None })],
-                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,4--4,23)), [],
-                  /root/TriviaIsPresentInSynTypeDefnSig.fsi (3,5--4,23),
+                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (5,4--5,23)), [],
+                  /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,5--5,23),
                   { LeadingKeyword =
-                     Type /root/TriviaIsPresentInSynTypeDefnSig.fsi (3,0--3,4)
+                     Type /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,0--4,4)
                     EqualsRange =
-                     Some /root/TriviaIsPresentInSynTypeDefnSig.fsi (3,7--3,8)
+                     Some /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/TriviaIsPresentInSynTypeDefnSig.fsi (3,0--4,23));
+              /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,0--5,23));
            Types
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Y],
-                     PreXmlDoc ((10,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((11,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (10,5--10,6)),
+                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (11,5--11,6)),
                   Simple
                     (TypeAbbrev
                        (Ok, LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/TriviaIsPresentInSynTypeDefnSig.fsi (10,9--10,12)),
-                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (10,9--10,12)),
-                  [], /root/TriviaIsPresentInSynTypeDefnSig.fsi (6,0--10,12),
+                        /root/TriviaIsPresentInSynTypeDefnSig.fsi (11,9--11,12)),
+                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (11,9--11,12)),
+                  [], /root/TriviaIsPresentInSynTypeDefnSig.fsi (7,0--11,12),
                   { LeadingKeyword =
-                     Type /root/TriviaIsPresentInSynTypeDefnSig.fsi (10,0--10,4)
+                     Type /root/TriviaIsPresentInSynTypeDefnSig.fsi (11,0--11,4)
                     EqualsRange =
-                     Some /root/TriviaIsPresentInSynTypeDefnSig.fsi (10,7--10,8)
+                     Some /root/TriviaIsPresentInSynTypeDefnSig.fsi (11,7--11,8)
                     WithKeyword = None })],
-              /root/TriviaIsPresentInSynTypeDefnSig.fsi (6,0--10,12));
+              /root/TriviaIsPresentInSynTypeDefnSig.fsi (7,0--11,12));
            Types
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Z],
-                     PreXmlDoc ((13,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((14,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,5--13,6)),
+                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,5--14,6)),
                   Simple
                     (None
-                       /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,5--14,32),
-                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,5--14,32)),
+                       /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,5--15,32),
+                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,5--15,32)),
                   [Member
                      (SynValSig
                         ([], SynIdent (P, None), SynValTyparDecls (None, true),
                          Fun
                            (LongIdent (SynLongIdent ([int], [], [None])),
                             LongIdent (SynLongIdent ([int], [], [None])),
-                            /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,22--14,32),
+                            /root/TriviaIsPresentInSynTypeDefnSig.fsi (15,22--15,32),
                             { ArrowRange =
-                               /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,26--14,28) }),
+                               /root/TriviaIsPresentInSynTypeDefnSig.fsi (15,26--15,28) }),
                          SynValInfo
                            ([[SynArgInfo ([], false, None)]],
                             SynArgInfo ([], false, None)), false, false,
-                         PreXmlDoc ((14,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         PreXmlDoc ((15,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None, None,
-                         /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,4--14,32),
+                         /root/TriviaIsPresentInSynTypeDefnSig.fsi (15,4--15,32),
                          { LeadingKeyword =
                             StaticMember
-                              (/root/TriviaIsPresentInSynTypeDefnSig.fsi (14,4--14,10),
-                               /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,11--14,17))
+                              (/root/TriviaIsPresentInSynTypeDefnSig.fsi (15,4--15,10),
+                               /root/TriviaIsPresentInSynTypeDefnSig.fsi (15,11--15,17))
                            InlineKeyword = None
                            WithKeyword = None
                            EqualsRange = None }),
@@ -109,24 +109,24 @@ SigFile
                         IsFinal = false
                         GetterOrSetterIsCompilerGenerated = false
                         MemberKind = Member },
-                      /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,4--14,32),
+                      /root/TriviaIsPresentInSynTypeDefnSig.fsi (15,4--15,32),
                       { GetSetKeywords = None })],
-                  /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,5--14,32),
+                  /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,5--15,32),
                   { LeadingKeyword =
-                     Type /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,0--13,4)
+                     Type /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,0--14,4)
                     EqualsRange = None
                     WithKeyword =
                      Some
-                       /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,7--13,11) })],
-              /root/TriviaIsPresentInSynTypeDefnSig.fsi (13,0--14,32))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/TriviaIsPresentInSynTypeDefnSig.fsi (1,0--14,32),
+                       /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,7--14,11) })],
+              /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,0--15,32))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/TriviaIsPresentInSynTypeDefnSig.fsi (2,0--15,32),
           { LeadingKeyword =
-             Module /root/TriviaIsPresentInSynTypeDefnSig.fsi (1,0--1,6) })],
+             Module /root/TriviaIsPresentInSynTypeDefnSig.fsi (2,0--2,6) })],
       { ConditionalDirectives =
          [If
             (Ident "CHECK_LINE0_TYPES",
-             /root/TriviaIsPresentInSynTypeDefnSig.fsi (7,0--7,21));
-          Else /root/TriviaIsPresentInSynTypeDefnSig.fsi (9,0--9,5);
-          EndIf /root/TriviaIsPresentInSynTypeDefnSig.fsi (11,0--11,6)]
+             /root/TriviaIsPresentInSynTypeDefnSig.fsi (8,0--8,21));
+          Else /root/TriviaIsPresentInSynTypeDefnSig.fsi (10,0--10,5);
+          EndIf /root/TriviaIsPresentInSynTypeDefnSig.fsi (12,0--12,6)]
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs
index a39a01f0d49..d481f3351fd 100644
--- a/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs
+++ b/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs
@@ -1 +1,2 @@
-fun (x, _) -> x * 3
\ No newline at end of file
+
+fun (x, _) -> x * 3
diff --git a/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs.bsl
index fe61a13b94a..1dad7840201 100644
--- a/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs.bsl
@@ -10,11 +10,11 @@ ImplFile
                  SimplePats
                    ([Id
                        (x, None, false, false, false,
-                        /root/TupleInLambdaHasArrowRange.fs (1,5--1,6));
+                        /root/TupleInLambdaHasArrowRange.fs (2,5--2,6));
                      Id
                        (_arg1, None, true, false, false,
-                        /root/TupleInLambdaHasArrowRange.fs (1,8--1,9))],
-                    /root/TupleInLambdaHasArrowRange.fs (1,4--1,10)),
+                        /root/TupleInLambdaHasArrowRange.fs (2,8--2,9))],
+                    /root/TupleInLambdaHasArrowRange.fs (2,4--2,10)),
                  App
                    (NonAtomic, false,
                     App
@@ -23,21 +23,21 @@ ImplFile
                          (false,
                           SynLongIdent
                             ([op_Multiply], [], [Some (OriginalNotation "*")]),
-                          None, /root/TupleInLambdaHasArrowRange.fs (1,16--1,17)),
-                       Ident x, /root/TupleInLambdaHasArrowRange.fs (1,14--1,17)),
+                          None, /root/TupleInLambdaHasArrowRange.fs (2,16--2,17)),
+                       Ident x, /root/TupleInLambdaHasArrowRange.fs (2,14--2,17)),
                     Const
-                      (Int32 3, /root/TupleInLambdaHasArrowRange.fs (1,18--1,19)),
-                    /root/TupleInLambdaHasArrowRange.fs (1,14--1,19)),
+                      (Int32 3, /root/TupleInLambdaHasArrowRange.fs (2,18--2,19)),
+                    /root/TupleInLambdaHasArrowRange.fs (2,14--2,19)),
                  Some
                    ([Paren
                        (Tuple
                           (false,
                            [Named
                               (SynIdent (x, None), false, None,
-                               /root/TupleInLambdaHasArrowRange.fs (1,5--1,6));
-                            Wild /root/TupleInLambdaHasArrowRange.fs (1,8--1,9)],
-                           /root/TupleInLambdaHasArrowRange.fs (1,5--1,9)),
-                        /root/TupleInLambdaHasArrowRange.fs (1,4--1,10))],
+                               /root/TupleInLambdaHasArrowRange.fs (2,5--2,6));
+                            Wild /root/TupleInLambdaHasArrowRange.fs (2,8--2,9)],
+                           /root/TupleInLambdaHasArrowRange.fs (2,5--2,9)),
+                        /root/TupleInLambdaHasArrowRange.fs (2,4--2,10))],
                     App
                       (NonAtomic, false,
                        App
@@ -47,18 +47,18 @@ ImplFile
                              SynLongIdent
                                ([op_Multiply], [], [Some (OriginalNotation "*")]),
                              None,
-                             /root/TupleInLambdaHasArrowRange.fs (1,16--1,17)),
+                             /root/TupleInLambdaHasArrowRange.fs (2,16--2,17)),
                           Ident x,
-                          /root/TupleInLambdaHasArrowRange.fs (1,14--1,17)),
+                          /root/TupleInLambdaHasArrowRange.fs (2,14--2,17)),
                        Const
                          (Int32 3,
-                          /root/TupleInLambdaHasArrowRange.fs (1,18--1,19)),
-                       /root/TupleInLambdaHasArrowRange.fs (1,14--1,19))),
-                 /root/TupleInLambdaHasArrowRange.fs (1,0--1,19),
+                          /root/TupleInLambdaHasArrowRange.fs (2,18--2,19)),
+                       /root/TupleInLambdaHasArrowRange.fs (2,14--2,19))),
+                 /root/TupleInLambdaHasArrowRange.fs (2,0--2,19),
                  { ArrowRange =
-                    Some /root/TupleInLambdaHasArrowRange.fs (1,11--1,13) }),
-              /root/TupleInLambdaHasArrowRange.fs (1,0--1,19))], PreXmlDocEmpty,
-          [], None, /root/TupleInLambdaHasArrowRange.fs (1,0--1,19),
+                    Some /root/TupleInLambdaHasArrowRange.fs (2,11--2,13) }),
+              /root/TupleInLambdaHasArrowRange.fs (2,0--2,19))], PreXmlDocEmpty,
+          [], None, /root/TupleInLambdaHasArrowRange.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs b/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs
index b18ebcb3c59..c950ac2612a 100644
--- a/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs
+++ b/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs
@@ -1,2 +1,3 @@
+
 let a : int * string = failwith "todo"
-let b : int * string * bool = 1, "", false
\ No newline at end of file
+let b : int * string * bool = 1, "", false
diff --git a/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs.bsl b/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
index d0d4e1a31d4..fa1f3288bf4 100644
--- a/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
+++ b/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
@@ -8,124 +8,124 @@ ImplFile
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (a, None), false, None,
-                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,4--1,5)),
+                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,4--2,5)),
                   Some
                     (SynBindingReturnInfo
                        (Tuple
                           (false,
                            [Type (LongIdent (SynLongIdent ([int], [], [None])));
                             Star
-                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,12--1,13);
+                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,12--2,13);
                             Type
                               (LongIdent (SynLongIdent ([string], [], [None])))],
-                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,8--1,20)),
-                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,8--1,20),
+                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,20)),
+                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,20),
                         [],
                         { ColonRange =
                            Some
-                             /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,6--1,7) })),
+                             /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,6--2,7) })),
                   Typed
                     (App
                        (NonAtomic, false, Ident failwith,
                         Const
                           (String
                              ("todo", Regular,
-                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,32--1,38)),
-                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,32--1,38)),
-                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,23--1,38)),
+                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,32--2,38)),
+                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,32--2,38)),
+                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,23--2,38)),
                      Tuple
                        (false,
                         [Type (LongIdent (SynLongIdent ([int], [], [None])));
                          Star
-                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,12--1,13);
+                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,12--2,13);
                          Type (LongIdent (SynLongIdent ([string], [], [None])))],
-                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,8--1,20)),
-                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,23--1,38)),
-                  /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,4--1,5),
+                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,20)),
+                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,23--2,38)),
+                  /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,4--2,5),
                   Yes
-                    /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,0--1,38),
+                    /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,38),
                   { LeadingKeyword =
                      Let
-                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,0--1,3)
+                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,21--1,22) })],
-              /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,0--1,38));
+                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,21--2,22) })],
+              /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,38));
            Let
              (false,
               [SynBinding
                  (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (b, None), false, None,
-                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,4--2,5)),
+                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,4--3,5)),
                   Some
                     (SynBindingReturnInfo
                        (Tuple
                           (false,
                            [Type (LongIdent (SynLongIdent ([int], [], [None])));
                             Star
-                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,12--2,13);
+                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,12--3,13);
                             Type
                               (LongIdent (SynLongIdent ([string], [], [None])));
                             Star
-                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,21--2,22);
+                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,21--3,22);
                             Type (LongIdent (SynLongIdent ([bool], [], [None])))],
-                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,27)),
-                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,27),
+                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,8--3,27)),
+                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,8--3,27),
                         [],
                         { ColonRange =
                            Some
-                             /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,6--2,7) })),
+                             /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,6--3,7) })),
                   Typed
                     (Tuple
                        (false,
                         [Const
                            (Int32 1,
-                            /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,30--2,31));
+                            /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,30--3,31));
                          Const
                            (String
                               ("", Regular,
-                               /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,33--2,35)),
-                            /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,33--2,35));
+                               /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,33--3,35)),
+                            /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,33--3,35));
                          Const
                            (Bool false,
-                            /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,37--2,42))],
-                        [/root/TupleReturnTypeOfBindingShouldContainStars.fs (2,31--2,32);
-                         /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,35--2,36)],
-                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,30--2,42)),
+                            /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,37--3,42))],
+                        [/root/TupleReturnTypeOfBindingShouldContainStars.fs (3,31--3,32);
+                         /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,35--3,36)],
+                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,30--3,42)),
                      Tuple
                        (false,
                         [Type (LongIdent (SynLongIdent ([int], [], [None])));
                          Star
-                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,12--2,13);
+                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,12--3,13);
                          Type (LongIdent (SynLongIdent ([string], [], [None])));
                          Star
-                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,21--2,22);
+                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,21--3,22);
                          Type (LongIdent (SynLongIdent ([bool], [], [None])))],
-                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,27)),
-                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,30--2,42)),
-                  /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,4--2,5),
+                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,8--3,27)),
+                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,30--3,42)),
+                  /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,4--3,5),
                   Yes
-                    /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,42),
+                    /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,0--3,42),
                   { LeadingKeyword =
                      Let
-                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,3)
+                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,0--3,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,28--2,29) })],
-              /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,42))],
+                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,28--3,29) })],
+              /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,0--3,42))],
           PreXmlDocEmpty, [], None,
-          /root/TupleReturnTypeOfBindingShouldContainStars.fs (1,0--2,42),
+          /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs b/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs
index 44bcdd090b5..ba2d10954fc 100644
--- a/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs
+++ b/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs
@@ -1,7 +1,8 @@
+
 type Foo =
 /// docs for Thing
 | Thing of
   /// docs for first
   first: string *
   /// docs for anon field
-  bool
\ No newline at end of file
+  bool
diff --git a/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs.bsl b/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs.bsl
index 8efc8681711..64e44ef1d32 100644
--- a/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs.bsl
+++ b/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/UnionCaseFieldsCanHaveComments.fs (1,5--1,8)),
+                     /root/UnionCaseFieldsCanHaveComments.fs (2,5--2,8)),
                   Simple
                     (Union
                        (None,
@@ -21,35 +21,35 @@ ImplFile
                                  ([], false, Some first,
                                   LongIdent
                                     (SynLongIdent ([string], [], [None])), false,
-                                  PreXmlDoc ((5,2), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((6,2), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/UnionCaseFieldsCanHaveComments.fs (4,2--5,15),
+                                  /root/UnionCaseFieldsCanHaveComments.fs (5,2--6,15),
                                   { LeadingKeyword = None });
                                SynField
                                  ([], false, None,
                                   LongIdent (SynLongIdent ([bool], [], [None])),
                                   false,
-                                  PreXmlDoc ((7,2), FSharp.Compiler.Xml.XmlDocCollector),
+                                  PreXmlDoc ((8,2), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/UnionCaseFieldsCanHaveComments.fs (6,2--7,6),
+                                  /root/UnionCaseFieldsCanHaveComments.fs (7,2--8,6),
                                   { LeadingKeyword = None })],
-                            PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                            PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/UnionCaseFieldsCanHaveComments.fs (2,0--7,6),
+                            /root/UnionCaseFieldsCanHaveComments.fs (3,0--8,6),
                             { BarRange =
                                Some
-                                 /root/UnionCaseFieldsCanHaveComments.fs (3,0--3,1) })],
-                        /root/UnionCaseFieldsCanHaveComments.fs (2,0--7,6)),
-                     /root/UnionCaseFieldsCanHaveComments.fs (2,0--7,6)), [],
-                  None, /root/UnionCaseFieldsCanHaveComments.fs (1,5--7,6),
+                                 /root/UnionCaseFieldsCanHaveComments.fs (4,0--4,1) })],
+                        /root/UnionCaseFieldsCanHaveComments.fs (3,0--8,6)),
+                     /root/UnionCaseFieldsCanHaveComments.fs (3,0--8,6)), [],
+                  None, /root/UnionCaseFieldsCanHaveComments.fs (2,5--8,6),
                   { LeadingKeyword =
-                     Type /root/UnionCaseFieldsCanHaveComments.fs (1,0--1,4)
+                     Type /root/UnionCaseFieldsCanHaveComments.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/UnionCaseFieldsCanHaveComments.fs (1,9--1,10)
+                     Some /root/UnionCaseFieldsCanHaveComments.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/UnionCaseFieldsCanHaveComments.fs (1,0--7,6))],
+              /root/UnionCaseFieldsCanHaveComments.fs (2,0--8,6))],
           PreXmlDocEmpty, [], None,
-          /root/UnionCaseFieldsCanHaveComments.fs (1,0--7,6),
+          /root/UnionCaseFieldsCanHaveComments.fs (2,0--9,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UseKeyword.fs b/tests/service/data/SyntaxTree/UseKeyword.fs
index 84c2faa40d4..33c3623b955 100644
--- a/tests/service/data/SyntaxTree/UseKeyword.fs
+++ b/tests/service/data/SyntaxTree/UseKeyword.fs
@@ -1,3 +1,4 @@
+
 do
     use x = X()
-    ()
\ No newline at end of file
+    ()
diff --git a/tests/service/data/SyntaxTree/UseKeyword.fs.bsl b/tests/service/data/SyntaxTree/UseKeyword.fs.bsl
index fba354e4050..b9bb75fb459 100644
--- a/tests/service/data/SyntaxTree/UseKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/UseKeyword.fs.bsl
@@ -9,26 +9,26 @@ ImplFile
                    (false, true,
                     [SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
                            None),
                         Named
                           (SynIdent (x, None), false, None,
-                           /root/UseKeyword.fs (2,8--2,9)), None,
+                           /root/UseKeyword.fs (3,8--3,9)), None,
                         App
                           (Atomic, false, Ident X,
-                           Const (Unit, /root/UseKeyword.fs (2,13--2,15)),
-                           /root/UseKeyword.fs (2,12--2,15)),
-                        /root/UseKeyword.fs (2,8--2,9),
-                        Yes /root/UseKeyword.fs (2,4--2,15),
-                        { LeadingKeyword = Use /root/UseKeyword.fs (2,4--2,7)
+                           Const (Unit, /root/UseKeyword.fs (3,13--3,15)),
+                           /root/UseKeyword.fs (3,12--3,15)),
+                        /root/UseKeyword.fs (3,8--3,9),
+                        Yes /root/UseKeyword.fs (3,4--3,15),
+                        { LeadingKeyword = Use /root/UseKeyword.fs (3,4--3,7)
                           InlineKeyword = None
-                          EqualsRange = Some /root/UseKeyword.fs (2,10--2,11) })],
-                    Const (Unit, /root/UseKeyword.fs (3,4--3,6)),
-                    /root/UseKeyword.fs (2,4--3,6), { InKeyword = None }),
-                 /root/UseKeyword.fs (1,0--3,6)), /root/UseKeyword.fs (1,0--3,6))],
-          PreXmlDocEmpty, [], None, /root/UseKeyword.fs (1,0--3,6),
+                          EqualsRange = Some /root/UseKeyword.fs (3,10--3,11) })],
+                    Const (Unit, /root/UseKeyword.fs (4,4--4,6)),
+                    /root/UseKeyword.fs (3,4--4,6), { InKeyword = None }),
+                 /root/UseKeyword.fs (2,0--4,6)), /root/UseKeyword.fs (2,0--4,6))],
+          PreXmlDocEmpty, [], None, /root/UseKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UseRecKeyword.fs b/tests/service/data/SyntaxTree/UseRecKeyword.fs
index f3743ffff8e..94da62460a1 100644
--- a/tests/service/data/SyntaxTree/UseRecKeyword.fs
+++ b/tests/service/data/SyntaxTree/UseRecKeyword.fs
@@ -1,3 +1,4 @@
+
 do
     use rec x = X()
-    ()
\ No newline at end of file
+    ()
diff --git a/tests/service/data/SyntaxTree/UseRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/UseRecKeyword.fs.bsl
index f8184cba34b..f05751516d2 100644
--- a/tests/service/data/SyntaxTree/UseRecKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/UseRecKeyword.fs.bsl
@@ -9,29 +9,29 @@ ImplFile
                    (true, true,
                     [SynBinding
                        (None, Normal, false, false, [],
-                        PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
                            None),
                         Named
                           (SynIdent (x, None), false, None,
-                           /root/UseRecKeyword.fs (2,12--2,13)), None,
+                           /root/UseRecKeyword.fs (3,12--3,13)), None,
                         App
                           (Atomic, false, Ident X,
-                           Const (Unit, /root/UseRecKeyword.fs (2,17--2,19)),
-                           /root/UseRecKeyword.fs (2,16--2,19)),
-                        /root/UseRecKeyword.fs (2,12--2,13),
-                        Yes /root/UseRecKeyword.fs (2,4--2,19),
+                           Const (Unit, /root/UseRecKeyword.fs (3,17--3,19)),
+                           /root/UseRecKeyword.fs (3,16--3,19)),
+                        /root/UseRecKeyword.fs (3,12--3,13),
+                        Yes /root/UseRecKeyword.fs (3,4--3,19),
                         { LeadingKeyword =
                            UseRec
-                             (/root/UseRecKeyword.fs (2,4--2,7),
-                              /root/UseRecKeyword.fs (2,8--2,11))
+                             (/root/UseRecKeyword.fs (3,4--3,7),
+                              /root/UseRecKeyword.fs (3,8--3,11))
                           InlineKeyword = None
-                          EqualsRange = Some /root/UseRecKeyword.fs (2,14--2,15) })],
-                    Const (Unit, /root/UseRecKeyword.fs (3,4--3,6)),
-                    /root/UseRecKeyword.fs (2,4--3,6), { InKeyword = None }),
-                 /root/UseRecKeyword.fs (1,0--3,6)),
-              /root/UseRecKeyword.fs (1,0--3,6))], PreXmlDocEmpty, [], None,
-          /root/UseRecKeyword.fs (1,0--3,6), { LeadingKeyword = None })],
+                          EqualsRange = Some /root/UseRecKeyword.fs (3,14--3,15) })],
+                    Const (Unit, /root/UseRecKeyword.fs (4,4--4,6)),
+                    /root/UseRecKeyword.fs (3,4--4,6), { InKeyword = None }),
+                 /root/UseRecKeyword.fs (2,0--4,6)),
+              /root/UseRecKeyword.fs (2,0--4,6))], PreXmlDocEmpty, [], None,
+          /root/UseRecKeyword.fs (2,0--5,0), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ValKeyword.fsi b/tests/service/data/SyntaxTree/ValKeyword.fsi
index ca027d46f5a..5b3ac02285b 100644
--- a/tests/service/data/SyntaxTree/ValKeyword.fsi
+++ b/tests/service/data/SyntaxTree/ValKeyword.fsi
@@ -1,4 +1,5 @@
+
 namespace X
 
 type Y =
-    val F : int
\ No newline at end of file
+    val F : int
diff --git a/tests/service/data/SyntaxTree/ValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ValKeyword.fsi.bsl
index 425d1ea53db..ddaf5b07bbf 100644
--- a/tests/service/data/SyntaxTree/ValKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ValKeyword.fsi.bsl
@@ -7,25 +7,25 @@ SigFile
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Y],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/ValKeyword.fsi (3,5--3,6)),
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/ValKeyword.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [ValField
                         (SynField
                            ([], false, Some F,
                             LongIdent (SynLongIdent ([int], [], [None])), false,
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            None, /root/ValKeyword.fsi (4,4--4,15),
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None, /root/ValKeyword.fsi (5,4--5,15),
                             { LeadingKeyword =
-                               Some (Val /root/ValKeyword.fsi (4,4--4,7)) }),
-                         /root/ValKeyword.fsi (4,4--4,15))],
-                     /root/ValKeyword.fsi (4,4--4,15)), [],
-                  /root/ValKeyword.fsi (3,5--4,15),
-                  { LeadingKeyword = Type /root/ValKeyword.fsi (3,0--3,4)
-                    EqualsRange = Some /root/ValKeyword.fsi (3,7--3,8)
-                    WithKeyword = None })], /root/ValKeyword.fsi (3,0--4,15))],
-          PreXmlDocEmpty, [], None, /root/ValKeyword.fsi (1,0--4,15),
-          { LeadingKeyword = Namespace /root/ValKeyword.fsi (1,0--1,9) })],
+                               Some (Val /root/ValKeyword.fsi (5,4--5,7)) }),
+                         /root/ValKeyword.fsi (5,4--5,15))],
+                     /root/ValKeyword.fsi (5,4--5,15)), [],
+                  /root/ValKeyword.fsi (4,5--5,15),
+                  { LeadingKeyword = Type /root/ValKeyword.fsi (4,0--4,4)
+                    EqualsRange = Some /root/ValKeyword.fsi (4,7--4,8)
+                    WithKeyword = None })], /root/ValKeyword.fsi (4,0--5,15))],
+          PreXmlDocEmpty, [], None, /root/ValKeyword.fsi (2,0--5,15),
+          { LeadingKeyword = Namespace /root/ValKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi b/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi
index ee918954f7c..3697be2b8b6 100644
--- a/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi
+++ b/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi
@@ -1,5 +1,6 @@
+
 module Meh
 
 [<Foo>]
 // meh
-val a : int
\ No newline at end of file
+val a : int
diff --git a/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi.bsl b/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi.bsl
index 8d1f7605264..facf462b12f 100644
--- a/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi.bsl
@@ -11,28 +11,28 @@ SigFile
                         ArgExpr =
                          Const
                            (Unit,
-                            /root/ValKeywordIsPresentInSynValSig.fsi (3,2--3,5))
+                            /root/ValKeywordIsPresentInSynValSig.fsi (4,2--4,5))
                         Target = None
                         AppliesToGetterAndSetter = false
                         Range =
-                         /root/ValKeywordIsPresentInSynValSig.fsi (3,2--3,5) }]
-                    Range = /root/ValKeywordIsPresentInSynValSig.fsi (3,0--3,7) }],
+                         /root/ValKeywordIsPresentInSynValSig.fsi (4,2--4,5) }]
+                    Range = /root/ValKeywordIsPresentInSynValSig.fsi (4,0--4,7) }],
                  SynIdent (a, None), SynValTyparDecls (None, true),
                  LongIdent (SynLongIdent ([int], [], [None])),
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 None, /root/ValKeywordIsPresentInSynValSig.fsi (3,0--5,11),
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None, /root/ValKeywordIsPresentInSynValSig.fsi (4,0--6,11),
                  { LeadingKeyword =
-                    Val /root/ValKeywordIsPresentInSynValSig.fsi (5,0--5,3)
+                    Val /root/ValKeywordIsPresentInSynValSig.fsi (6,0--6,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/ValKeywordIsPresentInSynValSig.fsi (3,0--5,11))],
-          PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/ValKeywordIsPresentInSynValSig.fsi (1,0--5,11),
+              /root/ValKeywordIsPresentInSynValSig.fsi (4,0--6,11))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/ValKeywordIsPresentInSynValSig.fsi (2,0--6,11),
           { LeadingKeyword =
-             Module /root/ValKeywordIsPresentInSynValSig.fsi (1,0--1,6) })],
+             Module /root/ValKeywordIsPresentInSynValSig.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/ValKeywordIsPresentInSynValSig.fsi (4,0--4,6)] },
+         [LineComment /root/ValKeywordIsPresentInSynValSig.fsi (5,0--5,6)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs b/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs
index 3f7b9f37894..73c6a6eb953 100644
--- a/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs
+++ b/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs
@@ -1 +1,2 @@
-#I @\"C:\\Temp\"
\ No newline at end of file
+
+#I @\"C:\\Temp\"
diff --git a/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
index f5b4164c7c3..7d1dc9d6b07 100644
--- a/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
+++ b/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
@@ -7,10 +7,10 @@ ImplFile
           [HashDirective
              (ParsedHashDirective
                 ("I", [],
-                 /root/VerbatimStringAsParsedHashDirectiveArgument.fs (1,0--1,2)),
-              /root/VerbatimStringAsParsedHashDirectiveArgument.fs (1,0--1,4))],
+                 /root/VerbatimStringAsParsedHashDirectiveArgument.fs (2,0--2,2)),
+              /root/VerbatimStringAsParsedHashDirectiveArgument.fs (2,0--2,4))],
           PreXmlDocEmpty, [], None,
-          /root/VerbatimStringAsParsedHashDirectiveArgument.fs (1,0--1,4),
+          /root/VerbatimStringAsParsedHashDirectiveArgument.fs (2,0--2,4),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
index d57977a323f..76932d3db94 100644
--- a/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
+++ b/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
@@ -1,3 +1,4 @@
+
 type Foo() =
     // A write-only property.
-    member this.MyWriteOnlyProperty with set (value) = myInternalValue <- value
\ No newline at end of file
+    member this.MyWriteOnlyProperty with set (value) = myInternalValue <- value
diff --git a/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
index 7682ed077d2..f0aa38ac498 100644
--- a/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -12,19 +12,19 @@ ImplFile
              ([SynTypeDefn
                  (SynComponentInfo
                     ([], None, [], [Foo],
-                     PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8)),
+                     /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                            /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                          None,
-                         PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                         PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
+                         /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                          { AsKeyword = None });
                       GetSetMember
                         (None,
@@ -32,7 +32,7 @@ ImplFile
                            (SynBinding
                               (None, Normal, false, false, [],
                                PreXmlMerge
-  (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
+  (PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
                                  (Some
                                     { IsInstance = true
@@ -48,65 +48,65 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyWriteOnlyProperty],
-                                     [/root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,15--3,16)],
+                                     [/root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,15--4,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Named
                                           (SynIdent (value, None), false, None,
-                                           /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,46--3,51)),
-                                        /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,45--3,52))],
+                                           /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,46--4,51)),
+                                        /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,45--4,52))],
                                   None,
-                                  /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,41--3,52)),
+                                  /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,41--4,52)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([myInternalValue], [], [None]),
                                   Ident value,
-                                  /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,55--3,79)),
-                               /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,41--3,52),
+                                  /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,55--4,79)),
+                               /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,41--4,52),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,10)
+                                    /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,53--3,54) })),
-                         /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,79),
+                                    /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,53--4,54) })),
+                         /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,79),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,36--3,40)
+                            /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,36--4,40)
                            GetKeyword = None
                            AndKeyword = None
                            SetKeyword =
                             Some
-                              /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,41--3,44) })],
-                     /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,79)),
+                              /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,41--4,44) })],
+                     /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,79)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,8--1,10)),
+                           /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                         None,
-                        PreXmlDoc ((1,8), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--1,8),
+                        PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                         { AsKeyword = None })),
-                  /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,5--3,79),
+                  /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--4,79),
                   { LeadingKeyword =
                      Type
-                       /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--1,4)
+                       /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,11--1,12)
+                       /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--3,79))],
+              /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--4,79))],
           PreXmlDocEmpty, [], None,
-          /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (1,0--3,79),
+          /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,4--2,29)] },
+            /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,29)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_LINE_.fs b/tests/service/data/SyntaxTree/_LINE_.fs
index 31814dce1c1..ee361209678 100644
--- a/tests/service/data/SyntaxTree/_LINE_.fs
+++ b/tests/service/data/SyntaxTree/_LINE_.fs
@@ -1 +1,2 @@
-__LINE__
\ No newline at end of file
+
+__LINE__
diff --git a/tests/service/data/SyntaxTree/_LINE_.fs.bsl b/tests/service/data/SyntaxTree/_LINE_.fs.bsl
index f87d3554cb6..2c7b5259c6a 100644
--- a/tests/service/data/SyntaxTree/_LINE_.fs.bsl
+++ b/tests/service/data/SyntaxTree/_LINE_.fs.bsl
@@ -5,9 +5,9 @@ ImplFile
          ([_LINE_], false, AnonModule,
           [Expr
              (Const
-                (SourceIdentifier ("__LINE__", "1", /root/_LINE_.fs (1,0--1,8)),
-                 /root/_LINE_.fs (1,0--1,8)), /root/_LINE_.fs (1,0--1,8))],
-          PreXmlDocEmpty, [], None, /root/_LINE_.fs (1,0--1,8),
+                (SourceIdentifier ("__LINE__", "2", /root/_LINE_.fs (2,0--2,8)),
+                 /root/_LINE_.fs (2,0--2,8)), /root/_LINE_.fs (2,0--2,8))],
+          PreXmlDocEmpty, [], None, /root/_LINE_.fs (2,0--2,8),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs b/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs
index 5be6362aebb..50cef151847 100644
--- a/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs
+++ b/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs
@@ -1 +1,2 @@
-__SOURCE_DIRECTORY__
\ No newline at end of file
+
+__SOURCE_DIRECTORY__
diff --git a/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl b/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl
index 99758dd59d1..dda204d7b85 100644
--- a/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl
+++ b/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              (Const
                 (SourceIdentifier
                    ("__SOURCE_DIRECTORY__", "C:\root",
-                    /root/_SOURCEDIRECTORY_.fs (1,0--1,20)),
-                 /root/_SOURCEDIRECTORY_.fs (1,0--1,20)),
-              /root/_SOURCEDIRECTORY_.fs (1,0--1,20))], PreXmlDocEmpty, [], None,
-          /root/_SOURCEDIRECTORY_.fs (1,0--1,20), { LeadingKeyword = None })],
+                    /root/_SOURCEDIRECTORY_.fs (2,0--2,20)),
+                 /root/_SOURCEDIRECTORY_.fs (2,0--2,20)),
+              /root/_SOURCEDIRECTORY_.fs (2,0--2,20))], PreXmlDocEmpty, [], None,
+          /root/_SOURCEDIRECTORY_.fs (2,0--2,20), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_SOURCEFILE_.fs b/tests/service/data/SyntaxTree/_SOURCEFILE_.fs
index 7bde7cfe7bf..a41ea179402 100644
--- a/tests/service/data/SyntaxTree/_SOURCEFILE_.fs
+++ b/tests/service/data/SyntaxTree/_SOURCEFILE_.fs
@@ -1 +1,2 @@
-__SOURCE_FILE__
\ No newline at end of file
+
+__SOURCE_FILE__
diff --git a/tests/service/data/SyntaxTree/_SOURCEFILE_.fs.bsl b/tests/service/data/SyntaxTree/_SOURCEFILE_.fs.bsl
index afd482a3582..f9b0ec65221 100644
--- a/tests/service/data/SyntaxTree/_SOURCEFILE_.fs.bsl
+++ b/tests/service/data/SyntaxTree/_SOURCEFILE_.fs.bsl
@@ -7,9 +7,9 @@ ImplFile
              (Const
                 (SourceIdentifier
                    ("__SOURCE_FILE__", "_SOURCEFILE_.fs",
-                    /root/_SOURCEFILE_.fs (1,0--1,15)),
-                 /root/_SOURCEFILE_.fs (1,0--1,15)),
-              /root/_SOURCEFILE_.fs (1,0--1,15))], PreXmlDocEmpty, [], None,
-          /root/_SOURCEFILE_.fs (1,0--1,15), { LeadingKeyword = None })],
+                    /root/_SOURCEFILE_.fs (2,0--2,15)),
+                 /root/_SOURCEFILE_.fs (2,0--2,15)),
+              /root/_SOURCEFILE_.fs (2,0--2,15))], PreXmlDocEmpty, [], None,
+          /root/_SOURCEFILE_.fs (2,0--2,15), { LeadingKeyword = None })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file

From ce341ab29e3d27dd8fe65270722a59a4d087e851 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Thu, 9 Feb 2023 11:58:42 +0100
Subject: [PATCH 5/8] Move original tests into designated folder.

---
 tests/service/SyntaxTreeTests.fs              |   7 +-
 .../SyntaxTree/ActivePatternAsFunction.fs.bsl |  25 --
 .../{ => Attribute}/RangeOfAttribute.fs       |   0
 .../Attribute/RangeOfAttribute.fs.bsl         |  46 +++
 .../RangeOfAttributeWithPath.fs               |   0
 .../Attribute/RangeOfAttributeWithPath.fs.bsl |  54 +++
 .../RangeOfAttributeWithTarget.fs             |   0
 .../RangeOfAttributeWithTarget.fs.bsl         |  52 +++
 .../ColonBeforeReturnTypeIsPartOfTrivia.fs    |   0
 ...ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl |  29 +-
 ...oreReturnTypeIsPartOfTriviaInProperties.fs |   0
 ...eturnTypeIsPartOfTriviaInProperties.fs.bsl |  72 ++--
 ...ConditionalDirectiveAroundInlineKeyword.fs |   0
 ...itionalDirectiveAroundInlineKeyword.fs.bsl |  45 ++-
 .../{ => Binding}/InlineKeywordInBinding.fs   |   0
 .../InlineKeywordInBinding.fs.bsl             |  50 ++-
 ...tternShouldBeIncludedInSynModuleDeclLet.fs |   0
 ...nShouldBeIncludedInSynModuleDeclLet.fs.bsl |  59 +++
 ...ouldBeIncludedInBindingOfSynExprObjExpr.fs |   0
 ...BeIncludedInBindingOfSynExprObjExpr.fs.bsl |  42 +-
 ...ncludedInConstructorSynMemberDefnMember.fs |   0
 ...dedInConstructorSynMemberDefnMember.fs.bsl |  38 +-
 ...onstructorSynMemberDefnMemberOptAsSpec.fs} |   0
 ...ructorSynMemberDefnMemberOptAsSpec.fs.bsl} |  42 +-
 ...cludedInFullSynMemberDefnMemberProperty.fs |   0
 ...edInFullSynMemberDefnMemberProperty.fs.bsl |  68 ++--
 ...eShouldBeIncludedInSecondaryConstructor.fs |   0
 ...uldBeIncludedInSecondaryConstructor.fs.bsl |  87 ++--
 ...uldBeIncludedInSynMemberDefnLetBindings.fs |   0
 ...eIncludedInSynMemberDefnLetBindings.fs.bsl |  36 +-
 ...teShouldBeIncludedInSynMemberDefnMember.fs |   0
 ...ouldBeIncludedInSynMemberDefnMember.fs.bsl |  41 +-
 ...ibuteShouldBeIncludedInSynModuleDeclLet.fs |   0
 ...eShouldBeIncludedInSynModuleDeclLet.fs.bsl |  25 +-
 ...dInWriteOnlySynMemberDefnMemberProperty.fs |   0
 ...riteOnlySynMemberDefnMemberProperty.fs.bsl |  44 +-
 ...ualSignShouldBePresentInLocalLetBinding.fs |   0
 ...ignShouldBePresentInLocalLetBinding.fs.bsl |  24 +-
 ...nShouldBePresentInLocalLetBindingTyped.fs} |   0
 ...ouldBePresentInLocalLetBindingTyped.fs.bsl |  58 +++
 ...EqualSignShouldBePresentInMemberBinding.fs |   0
 ...lSignShouldBePresentInMemberBinding.fs.bsl |  36 +-
 ...BePresentInMemberBindingWithParameters.fs} |   0
 ...esentInMemberBindingWithParameters.fs.bsl} |  44 +-
 ...BePresentInMemberBindingWithReturnType.fs} |   0
 ...esentInMemberBindingWithReturnType.fs.bsl} |  50 +--
 ...ngeOfEqualSignShouldBePresentInProperty.fs |   0
 ...fEqualSignShouldBePresentInProperty.fs.bsl |  64 +--
 ...houldBePresentInSynModuleDeclLetBinding.fs |   0
 ...dBePresentInSynModuleDeclLetBinding.fs.bsl |  19 +-
 ...ePresentInSynModuleDeclLetBindingTyped.fs} |   0
 ...esentInSynModuleDeclLetBindingTyped.fs.bsl |  49 +++
 ...ShouldBePresentInSynExprLetOrUseBinding.fs |   0
 ...ldBePresentInSynExprLetOrUseBinding.fs.bsl |  29 +-
 ...houldBePresentInSynModuleDeclLetBinding.fs |   0
 ...dBePresentInSynModuleDeclLetBinding.fs.bsl |  18 +-
 ...InSynModuleDeclLetBindingWithAttributes.fs |   0
 ...nModuleDeclLetBindingWithAttributes.fs.bsl |  55 +++
 ...leReturnTypeOfBindingShouldContainStars.fs |   0
 ...turnTypeOfBindingShouldContainStars.fs.bsl | 131 ++++++
 .../BlockCommentInSourceCode.fs               |   0
 .../BlockCommentInSourceCode.fs.bsl           |  36 +-
 ...BlockCommentInSourceCodeSignatureFile.fsi} |   0
 ...kCommentInSourceCodeSignatureFile.fsi.bsl} |  16 +-
 .../CommentAfterSourceCode.fs                 |   0
 .../CodeComment/CommentAfterSourceCode.fs.bsl |  20 +
 .../CommentAfterSourceCodeSignatureFile.fsi}  |   0
 ...mmentAfterSourceCodeSignatureFile.fsi.bsl} |  17 +-
 .../{ => CodeComment}/CommentAtEndOfFile.fs   |   0
 .../CodeComment/CommentAtEndOfFile.fs.bsl     |  14 +
 .../{ => CodeComment}/CommentOnSingleLine.fs  |   0
 .../CodeComment/CommentOnSingleLine.fs.bsl    |  20 +
 .../CommentOnSingleLineSignatureFile.fsi}     |   0
 .../CommentOnSingleLineSignatureFile.fsi.bsl  |  15 +
 ...uldBeCapturedIfUsedInAnInvalidLocation.fs} |   0
 ...BeCapturedIfUsedInAnInvalidLocation.fs.bsl |  71 ++++
 .../TripleSlashCommentShouldNotBeCaptured.fs  |   0
 ...ipleSlashCommentShouldNotBeCaptured.fs.bsl |  19 +-
 .../SyntaxTree/CommentAfterSourceCode.fs.bsl  |  17 -
 .../data/SyntaxTree/CommentAtEndOfFile.fs.bsl |  12 -
 .../SyntaxTree/CommentBetweenElseAndIf.fs.bsl |  36 --
 .../CommentOnSingleLine,SignatureFile.fsi.bsl |  13 -
 .../SyntaxTree/CommentOnSingleLine.fs.bsl     |  17 -
 ...eThatStartsAtAndAndEndsAfterExpression.fs} |   0
 ...atStartsAtAndAndEndsAfterExpression.fs.bsl |  79 ++++
 ...RangeStartsAtAndAndEndsAfterExpression.fs} |   0
 ...geStartsAtAndAndEndsAfterExpression.fs.bsl |  59 +++
 ...nMultilineCommentAreNotReportedAsTrivia.fs |   0
 ...tilineCommentAreNotReportedAsTrivia.fs.bsl |  42 ++
 ...ntAreNotReportedAsTriviaSignatureFile.fsi} |   0
 ...reNotReportedAsTriviaSignatureFile.fsi.bsl |  37 ++
 ...InMultilineStringAreNotReportedAsTrivia.fs |   0
 ...ltilineStringAreNotReportedAsTrivia.fs.bsl |  19 +-
 ...ngAreNotReportedAsTriviaSignatureFile.fsi} |   0
 ...reNotReportedAsTriviaSignatureFile.fsi.bsl |  13 +
 .../NestedIfElseEndif.fs                      |   0
 .../NestedIfElseEndif.fs.bsl                  |  46 +++
 .../NestedIfElseEndifSignatureFile.fsi}       |   0
 .../NestedIfElseEndifSignatureFile.fsi.bsl    |  47 +++
 .../NestedIfEndifWithComplexExpressions.fs    |   0
 ...NestedIfEndifWithComplexExpressions.fs.bsl |  51 +++
 ...ifWithComplexExpressionsSignatureFile.fsi} |   0
 ...ithComplexExpressionsSignatureFile.fsi.bsl |  49 +++
 .../SingleIfElseEndif.fs                      |   0
 .../SingleIfElseEndif.fs.bsl                  |  40 ++
 .../SingleIfElseEndifSignatureFile.fsi}       |   0
 .../SingleIfElseEndifSignatureFile.fsi.bsl    |  40 ++
 .../SingleIfEndif.fs                          |   0
 .../ConditionalDirective/SingleIfEndif.fs.bsl |  37 ++
 .../SingleIfEndifSignatureFile.fsi}           |   0
 .../SingleIfEndifSignatureFile.fsi.bsl        |  38 ++
 ...eRangeShouldStartAtNamespaceKeyword.fs.bsl |  39 --
 .../SyntaxTree/DeeplyNestedIfThenElse.fs.bsl  |  48 ---
 .../DestructedLambdaHasArrowRange.fs.bsl      | 101 -----
 ...tDifferenceBetweenCompiledOperators.fs.bsl |  41 --
 ...eNotReportedAsTrivia,SignatureFile.fsi.bsl |  37 --
 ...tilineCommentAreNotReportedAsTrivia.fs.bsl |  41 --
 ...eNotReportedAsTrivia,SignatureFile.fsi.bsl |  13 -
 .../service/data/SyntaxTree/DoKeyword.fs.bsl  |  36 --
 .../data/SyntaxTree/DoStaticKeyword.fs.bsl    |  41 --
 .../ElseKeywordInSimpleIfThenElse.fs.bsl      |  25 --
 .../MultipleSynEnumCasesHaveBarRange.fs       |   0
 .../MultipleSynEnumCasesHaveBarRange.fs.bsl   |  56 +++
 .../SingleSynEnumCaseHasBarRange.fs           |   0
 .../SingleSynEnumCaseHasBarRange.fs.bsl       |  44 ++
 .../SingleSynEnumCaseWithoutBar.fs            |   0
 .../SingleSynEnumCaseWithoutBar.fs.bsl        |  42 ++
 ...nShouldContainsTheRangeOfTheWithKeyword.fs |   0
 ...uldContainsTheRangeOfTheWithKeyword.fs.bsl |  33 +-
 ...angeOfTheEqualsSignInSynExprRecordField.fs |   0
 ...OfTheEqualsSignInSynExprRecordField.fs.bsl |  14 +-
 .../GlobalKeywordAsSynExpr.fs                 |   0
 .../GlobalKeywordAsSynExpr.fs.bsl             |   9 +-
 ...angeOfTheEqualsSignInSynExprRecordField.fs |   0
 ...OfTheEqualsSignInSynExprRecordField.fs.bsl |  44 ++
 ...ExprLetOrUseContainsTheRangeOfInKeyword.fs |   0
 ...LetOrUseContainsTheRangeOfInKeyword.fs.bsl |  59 +--
 .../SynExprAnonRecdWithStructKeyword.fs       |   0
 .../SynExprAnonRecdWithStructKeyword.fs.bsl   |  28 ++
 ...tainsTheRangeOfTheEqualsSignInTheFields.fs |   0
 ...sTheRangeOfTheEqualsSignInTheFields.fs.bsl |  37 ++
 ...SynExprDoContainsTheRangeOfTheDoKeyword.fs |   0
 ...xprDoContainsTheRangeOfTheDoKeyword.fs.bsl |  20 +-
 .../SynExprDynamicDoesContainIdent.fs         |   0
 .../SynExprDynamicDoesContainIdent.fs.bsl     |  18 +
 .../SynExprDynamicDoesContainParentheses.fs   |   0
 ...ynExprDynamicDoesContainParentheses.fs.bsl |  23 ++
 ...nExprForContainsTheRangeOfTheEqualsSign.fs |   0
 ...rForContainsTheRangeOfTheEqualsSign.fs.bsl |  41 ++
 ...rUseBangContainsTheRangeOfTheEqualsSign.fs |   0
 ...BangContainsTheRangeOfTheEqualsSign.fs.bsl |  57 +++
 ...ExprLetOrUseContainsTheRangeOfInKeyword.fs |   0
 ...LetOrUseContainsTheRangeOfInKeyword.fs.bsl |  24 +-
 ...tOrUseDoesNotContainTheRangeOfInKeyword.fs |   0
 ...seDoesNotContainTheRangeOfInKeyword.fs.bsl |  25 +-
 ...actersDoesNotContainTheRangeOfInKeyword.fs |   0
 ...rsDoesNotContainTheRangeOfInKeyword.fs.bsl |  69 ++++
 ...rsiveBindingContainsTheRangeOfInKeyword.fs |   0
 ...eBindingContainsTheRangeOfInKeyword.fs.bsl |  74 ++++
 ...ontainsTheRangeOfTheMatchAndWithKeyword.fs |   0
 ...insTheRangeOfTheMatchAndWithKeyword.fs.bsl |  38 ++
 ...ontainsTheRangeOfTheMatchAndWithKeyword.fs |   0
 ...insTheRangeOfTheMatchAndWithKeyword.fs.bsl |  38 ++
 ...xprObjExprContainsTheRangeOfWithKeyword.fs |   0
 ...bjExprContainsTheRangeOfWithKeyword.fs.bsl |  74 ++--
 .../{ => Expression}/SynExprObjWithSetter.fs  |   0
 .../SynExprObjWithSetter.fs.bsl               |  94 +++--
 ...angeOfTheEqualsSignInSynExprRecordField.fs |   0
 ...OfTheEqualsSignInSynExprRecordField.fs.bsl |  22 +-
 ...ecordFieldsContainCorrectAmountOfTrivia.fs |   0
 ...dFieldsContainCorrectAmountOfTrivia.fs.bsl |  42 +-
 .../SynExprSetWithSynExprDynamic.fs           |   0
 .../SynExprSetWithSynExprDynamic.fs.bsl       |  23 ++
 ...yContainsTheRangeOfTheTryAndWithKeyword.fs |   0
 ...tainsTheRangeOfTheTryAndWithKeyword.fs.bsl |  30 ++
 ...hContainsTheRangeOfTheTryAndWithKeyword.fs |   0
 ...tainsTheRangeOfTheTryAndWithKeyword.fs.bsl |  44 ++
 .../ExternKeywordIsPresentInTrivia.fs         |   0
 .../ExternKeywordIsPresentInTrivia.fs.bsl     |  32 +-
 ...GlobalInOpenPathShouldContainTrivia.fs.bsl |  20 -
 ...espaceShouldStartAtNamespaceKeyword.fs.bsl |  41 --
 ...f,ThenAndElseKeywordOnSeparateLines.fs.bsl |  27 --
 .../SyntaxTree/IfKeywordInIfThenElse.fs.bsl   |  21 -
 .../CommentBetweenElseAndIf.fs                |   0
 .../IfThenElse/CommentBetweenElseAndIf.fs.bsl |  43 ++
 .../DeeplyNestedIfThenElse.fs                 |   0
 .../IfThenElse/DeeplyNestedIfThenElse.fs.bsl  |  59 +++
 .../ElseKeywordInSimpleIfThenElse.fs          |   0
 .../ElseKeywordInSimpleIfThenElse.fs.bsl      |  29 ++
 .../{ => IfThenElse}/IfKeywordInIfThenElse.fs |   0
 .../IfThenElse/IfKeywordInIfThenElse.fs.bsl   |  25 ++
 .../IfThenAndElseKeywordOnSeparateLines.fs}   |   0
 ...IfThenAndElseKeywordOnSeparateLines.fs.bsl |  29 ++
 .../NestedElifInIfThenElse.fs                 |   0
 .../IfThenElse/NestedElifInIfThenElse.fs.bsl  |  40 ++
 .../NestedElseIfInIfThenElse.fs               |   0
 .../NestedElseIfInIfThenElse.fs.bsl           |  41 ++
 .../NestedElseIfOnTheSameLineInIfThenElse.fs  |   0
 ...stedElseIfOnTheSameLineInIfThenElse.fs.bsl |  44 ++
 .../data/SyntaxTree/InHeadPattern.fs.bsl      |  39 --
 .../SyntaxTree/IncompleteLongIdent.fs.bsl     |  17 -
 .../data/SyntaxTree/InfixOperation.fs.bsl     |  24 --
 ...OfTheEqualsSignInSynExprRecordField.fs.bsl |  44 --
 .../data/SyntaxTree/InlineKeyword.fsi.bsl     |  26 --
 .../ComplexArgumentsLambdaHasArrowRange.fs    |   0
 ...ComplexArgumentsLambdaHasArrowRange.fs.bsl | 155 ++++----
 .../DestructedLambdaHasArrowRange.fs          |   0
 .../DestructedLambdaHasArrowRange.fs.bsl      | 102 +++++
 ...leParameterWithWildCardGivesCorrectBody.fs |   0
 ...rameterWithWildCardGivesCorrectBody.fs.bsl |  72 ++++
 ...LambdaWithTwoParametersGivesCorrectBody.fs |   0
 ...daWithTwoParametersGivesCorrectBody.fs.bsl |  44 ++
 ...daWithWildCardParameterGivesCorrectBody.fs |   0
 ...thWildCardParameterGivesCorrectBody.fs.bsl |  58 +++
 ...dCardThatReturnsALambdaGivesCorrectBody.fs |   0
 ...dThatReturnsALambdaGivesCorrectBody.fs.bsl |  62 +++
 .../MultilineLambdaHasArrowRange.fs           |   0
 .../MultilineLambdaHasArrowRange.fs.bsl       |  64 +--
 .../{ => Lambda}/SimpleLambdaHasArrowRange.fs |   0
 .../Lambda/SimpleLambdaHasArrowRange.fs.bsl   |  29 ++
 .../TupleInLambdaHasArrowRange.fs             |   0
 .../Lambda/TupleInLambdaHasArrowRange.fs.bsl  |  69 ++++
 ...rameterWithWildCardGivesCorrectBody.fs.bsl |  71 ----
 ...daWithTwoParametersGivesCorrectBody.fs.bsl |  44 --
 ...thWildCardParameterGivesCorrectBody.fs.bsl |  58 ---
 ...dThatReturnsALambdaGivesCorrectBody.fs.bsl |  61 ---
 .../{ => LeadingKeyword}/AbstractKeyword.fs   |   0
 .../AbstractKeyword.fs.bsl                    |  31 +-
 .../AbstractMemberKeyword.fs                  |   0
 .../AbstractMemberKeyword.fs.bsl              |  30 +-
 .../{ => LeadingKeyword}/AndKeyword.fs        |   0
 .../{ => LeadingKeyword}/AndKeyword.fs.bsl    |  55 +--
 .../{ => LeadingKeyword}/DefaultKeyword.fsi   |   0
 .../DefaultKeyword.fsi.bsl                    |  33 +-
 .../{ => LeadingKeyword}/DefaultValKeyword.fs |   0
 .../DefaultValKeyword.fs.bsl                  |  39 +-
 .../{ => LeadingKeyword}/DoKeyword.fs         |   0
 .../LeadingKeyword/DoKeyword.fs.bsl           |  47 +++
 .../{ => LeadingKeyword}/DoStaticKeyword.fs   |   0
 .../LeadingKeyword/DoStaticKeyword.fs.bsl     |  51 +++
 .../{ => LeadingKeyword}/ExternKeyword.fs     |   0
 .../{ => LeadingKeyword}/ExternKeyword.fs.bsl |  36 +-
 .../{ => LeadingKeyword}/LetKeyword.fs        |   0
 .../LeadingKeyword/LetKeyword.fs.bsl          |  47 +++
 .../{ => LeadingKeyword}/LetRecKeyword.fs     |   0
 .../LeadingKeyword/LetRecKeyword.fs.bsl       |  54 +++
 .../{ => LeadingKeyword}/MemberKeyword.fs     |   0
 .../LeadingKeyword/MemberKeyword.fs.bsl       |  69 ++++
 .../{ => LeadingKeyword}/MemberValKeyword.fs  |   0
 .../MemberValKeyword.fs.bsl                   |  40 +-
 .../{ => LeadingKeyword}/NewKeyword.fs        |   0
 .../{ => LeadingKeyword}/NewKeyword.fs.bsl    |  60 ++-
 .../{ => LeadingKeyword}/OverrideKeyword.fs   |   0
 .../OverrideKeyword.fs.bsl                    |  47 ++-
 .../OverrideValKeyword.fs                     |   0
 .../OverrideValKeyword.fs.bsl                 |  32 +-
 .../StaticAbstractKeyword.fs                  |   0
 .../StaticAbstractKeyword.fs.bsl              |  34 +-
 .../StaticAbstractMemberKeyword.fs            |   0
 .../StaticAbstractMemberKeyword.fs.bsl        |  34 +-
 .../{ => LeadingKeyword}/StaticLetKeyword.fs  |   0
 .../LeadingKeyword/StaticLetKeyword.fs.bsl    |  57 +++
 .../StaticLetRecKeyword.fs                    |   0
 .../LeadingKeyword/StaticLetRecKeyword.fs.bsl |  67 ++++
 .../StaticMemberKeyword.fs                    |   0
 .../StaticMemberKeyword.fs.bsl                |  42 +-
 .../StaticMemberValKeyword.fs                 |   0
 .../StaticMemberValKeyword.fs.bsl             |  34 +-
 .../{ => LeadingKeyword}/StaticValKeyword.fsi |   0
 .../LeadingKeyword/StaticValKeyword.fsi.bsl   |  48 +++
 .../{ => LeadingKeyword}/SyntheticKeyword.fs  |   0
 .../LeadingKeyword/SyntheticKeyword.fs.bsl    |  36 ++
 .../{ => LeadingKeyword}/UseKeyword.fs        |   0
 .../LeadingKeyword/UseKeyword.fs.bsl          |  41 ++
 .../{ => LeadingKeyword}/UseRecKeyword.fs     |   0
 .../LeadingKeyword/UseRecKeyword.fs.bsl       |  46 +++
 .../{ => LeadingKeyword}/ValKeyword.fsi       |   0
 .../LeadingKeyword/ValKeyword.fsi.bsl         |  39 ++
 .../LeadingKeywordInRecursiveTypes.fsi.bsl    |  46 ---
 .../service/data/SyntaxTree/LetKeyword.fs.bsl |  42 --
 .../data/SyntaxTree/LetRecKeyword.fs.bsl      |  45 ---
 ...InASingleSynMatchClauseInSynExprTryWith.fs |   0
 ...ingleSynMatchClauseInSynExprTryWith.fs.bsl |  53 +++
 .../RangeOfArrowInSynMatchClause.fs           |   0
 .../RangeOfArrowInSynMatchClause.fs.bsl       |  43 ++
 ...geOfArrowInSynMatchClauseWithWhenClause.fs |   0
 ...ArrowInSynMatchClauseWithWhenClause.fs.bsl |  51 +++
 ...MultipleSynMatchClausesInSynExprTryWith.fs |   0
 ...ipleSynMatchClausesInSynExprTryWith.fs.bsl |  77 ++++
 ...arInASingleSynMatchClauseInSynExprMatch.fs |   0
 ...ASingleSynMatchClauseInSynExprMatch.fs.bsl |  52 +++
 ...InASingleSynMatchClauseInSynExprTryWith.fs |   0
 ...ingleSynMatchClauseInSynExprTryWith.fs.bsl |  51 +++
 ...InMultipleSynMatchClausesInSynExprMatch.fs |   0
 ...ltipleSynMatchClausesInSynExprMatch.fs.bsl |  77 ++++
 .../RangeOfMultipleSynMatchClause.fs          |   0
 .../RangeOfMultipleSynMatchClause.fs.bsl      |  98 +++++
 .../RangeOfSingleSynMatchClause.fs            |   0
 .../RangeOfSingleSynMatchClause.fs.bsl        |  81 ++++
 ...angeOfSingleSynMatchClauseFollowedByBar.fs |   0
 ...OfSingleSynMatchClauseFollowedByBar.fs.bsl |  73 ++++
 ...geOfSingleSynMatchClauseWithMissingBody.fs |   0
 ...SingleSynMatchClauseWithMissingBody.fs.bsl |  71 ++++
 ...ynMatchClauseWithMissingBodyAndWhenExpr.fs |   0
 ...tchClauseWithMissingBodyAndWhenExpr.fs.bsl |  82 ++++
 .../MeasureContainsTheRangeOfTheConstant.fs   |   0
 ...easureContainsTheRangeOfTheConstant.fs.bsl |  75 ++++
 .../SynMeasureParenHasCorrectRange.fs         |   0
 .../SynMeasureParenHasCorrectRange.fs.bsl     |  37 ++
 ...nTypeTupleInMeasureTypeWithLeadingSlash.fs |   0
 ...eTupleInMeasureTypeWithLeadingSlash.fs.bsl |  28 +-
 .../SynTypeTupleInMeasureTypeWithNoSlashes.fs |   0
 ...TypeTupleInMeasureTypeWithNoSlashes.fs.bsl |  28 +-
 ...TypeTupleInMeasureTypeWithStartAndSlash.fs |   0
 ...TupleInMeasureTypeWithStartAndSlash.fs.bsl |  30 +-
 ...easureContainsTheRangeOfTheConstant.fs.bsl |  73 ----
 .../GetSetMemberWithInlineKeyword.fs          |   0
 .../GetSetMemberWithInlineKeyword.fs.bsl      |  65 +--
 .../{ => Member}/ImplicitCtorWithAsKeyword.fs |   0
 .../ImplicitCtorWithAsKeyword.fs.bsl          |  71 ++--
 .../{ => Member}/MemberWithInlineKeyword.fs   |   0
 .../MemberWithInlineKeyword.fs.bsl            |  38 +-
 ...nMemberContainsTheRangeOfTheWithKeyword.fs |   0
 ...berContainsTheRangeOfTheWithKeyword.fs.bsl |  46 +--
 ...nMemberContainsTheRangeOfTheWithKeyword.fs |   0
 ...berContainsTheRangeOfTheWithKeyword.fs.bsl |  66 +--
 .../{ => Member}/SignatureMemberWithGet.fsi   |   0
 .../SignatureMemberWithGet.fsi.bsl            |  34 +-
 .../{ => Member}/SignatureMemberWithSet.fsi   |   0
 .../SignatureMemberWithSet.fsi.bsl            |  34 +-
 .../SignatureMemberWithSetget.fsi}            |   0
 .../SignatureMemberWithSetget.fsi.bsl}        |  33 +-
 ...actSlotContainsTheRangeOfTheWithKeyword.fs |   0
 ...lotContainsTheRangeOfTheWithKeyword.fs.bsl |  38 +-
 ...PropertyContainsTheRangeOfTheEqualsSign.fs |   0
 ...ertyContainsTheRangeOfTheEqualsSign.fs.bsl |  54 +--
 ...ropertyContainsTheRangeOfTheWithKeyword.fs |   0
 ...rtyContainsTheRangeOfTheWithKeyword.fs.bsl |  46 +--
 ...nTypeDefnWithMemberWithGetHasXmlComment.fs |   0
 ...eDefnWithMemberWithGetHasXmlComment.fs.bsl |  38 +-
 .../SynTypeDefnWithMemberWithSetget.fs        |   0
 .../SynTypeDefnWithMemberWithSetget.fs.bsl    |  83 ++--
 .../SynTypeDefnWithStaticMemberWithGetset.fs  |   0
 ...nTypeDefnWithStaticMemberWithGetset.fs.bsl |  90 ++---
 ...nMemberContainsTheRangeOfTheWithKeyword.fs |   0
 ...berContainsTheRangeOfTheWithKeyword.fs.bsl |  48 +--
 .../SynExprObjMembersHaveCorrectKeywords.fs   |   0
 ...ynExprObjMembersHaveCorrectKeywords.fs.bsl |  81 ++--
 ...MemberDefnAbstractSlotHasCorrectKeyword.fs |   0
 ...erDefnAbstractSlotHasCorrectKeyword.fs.bsl |  30 +-
 ...MemberDefnAutoPropertyHasCorrectKeyword.fs |   0
 ...erDefnAutoPropertyHasCorrectKeyword.fs.bsl |  58 +--
 ...erDefnMemberSynValDataHasCorrectKeyword.fs |   0
 ...fnMemberSynValDataHasCorrectKeyword.fs.bsl |  93 ++---
 .../SynMemberSigMemberHasCorrectKeywords.fsi  |   0
 ...nMemberSigMemberHasCorrectKeywords.fsi.bsl |  59 +--
 .../data/SyntaxTree/MemberKeyword.fs.bsl      |  56 ---
 ...spaceRangeShouldStartAtNamespaceKeyword.fs |   0
 ...eRangeShouldStartAtNamespaceKeyword.fs.bsl |  40 ++
 .../GlobalInOpenPathShouldContainTrivia.fs    |   0
 ...GlobalInOpenPathShouldContainTrivia.fs.bsl |  21 +
 ...lNamespaceShouldStartAtNamespaceKeyword.fs |   0
 ...espaceShouldStartAtNamespaceKeyword.fs.bsl |  42 ++
 .../ModuleRangeShouldStartAtFirstAttribute.fs |   0
 ...uleRangeShouldStartAtFirstAttribute.fs.bsl |  63 +++
 .../ModuleShouldContainModuleKeyword.fs       |   0
 .../ModuleShouldContainModuleKeyword.fs.bsl   |  91 +++++
 ...veARangeThatStartsAtTheNamespaceKeyword.fs |   0
 ...angeThatStartsAtTheNamespaceKeyword.fs.bsl |  68 ++++
 .../NamespaceShouldContainNamespaceKeyword.fs |   0
 ...espaceShouldContainNamespaceKeyword.fs.bsl |  54 +++
 ...NamespaceShouldStartAtNamespaceKeyword.fsi |   0
 ...spaceShouldStartAtNamespaceKeyword.fsi.bsl |  32 +-
 ...ModuleRangeShouldStartAtFirstAttribute.fsi |   0
 ...leRangeShouldStartAtFirstAttribute.fsi.bsl |  20 +-
 .../ModuleShouldContainModuleKeyword.fsi      |   0
 .../ModuleShouldContainModuleKeyword.fsi.bsl  |  17 +-
 ...NamespaceShouldContainNamespaceKeyword.fsi |   0
 ...spaceShouldContainNamespaceKeyword.fsi.bsl |  20 +-
 ...rReturnsRangeOfSynModuleOrNamespaceSig.fsi |   0
 ...urnsRangeOfSynModuleOrNamespaceSig.fsi.bsl |  28 +-
 ...uleRangeShouldStartAtFirstAttribute.fs.bsl |  60 ---
 .../ModuleShouldContainModuleKeyword.fs.bsl   |  86 ----
 ...angeThatStartsAtTheNamespaceKeyword.fs.bsl |  68 ----
 ...eSynEnumCaseContainsRangeOfConstant.fs.bsl |  56 ---
 .../MultipleSynEnumCasesHaveBarRange.fs.bsl   |  53 ---
 ...tStartsAtAnd!AndEndsAfterExpression.fs.bsl |  79 ----
 .../data/SyntaxTree/NamedParameter.fs.bsl     |  30 --
 .../data/SyntaxTree/NameofOperator.fs.bsl     |  23 --
 ...espaceShouldContainNamespaceKeyword.fs.bsl |  52 ---
 .../SyntaxTree/NestedElifInIfThenElse.fs.bsl  |  33 --
 .../NestedElseIfInIfThenElse.fs.bsl           |  35 --
 ...stedElseIfOnTheSameLineInIfThenElse.fs.bsl |  43 --
 .../NestedIfElseEndif,SignatureFile.fsi.bsl   |  38 --
 .../data/SyntaxTree/NestedIfElseEndif.fs.bsl  |  33 --
 ...thComplexExpressions,SignatureFile.fsi.bsl |  49 ---
 ...NestedIfEndifWithComplexExpressions.fs.bsl |  46 ---
 ...ldBeIncludedInSynModuleDeclNestedModule.fs |   0
 ...IncludedInSynModuleDeclNestedModule.fs.bsl |  45 +++
 ...IncludedInSynModuleSigDeclNestedModule.fsi |   0
 ...udedInSynModuleSigDeclNestedModule.fsi.bsl |  26 +-
 .../RangeOfEqualSignShouldBePresent.fs        |   0
 .../RangeOfEqualSignShouldBePresent.fs.bsl    |  31 ++
 ...EqualSignShouldBePresentSignatureFile.fsi} |   0
 ...lSignShouldBePresentSignatureFile.fsi.bsl} |  22 +-
 ...FileShouldEndAtTheLastSynModuleSigDecl.fsi |   0
 ...ShouldEndAtTheLastSynModuleSigDecl.fsi.bsl | 376 +++++++++---------
 ...ingleSynMatchClauseInSynExprTryWith.fs.bsl |  52 ---
 .../data/SyntaxTree/OperatorAsFunction.fs.bsl |  28 --
 .../SyntaxTree/OperatorInMatchPattern.fs.bsl  |  38 --
 .../OperatorInSynPatLongIdent.fs.bsl          |  55 ---
 .../ActivePatternAsFunction.fs                |   0
 .../ActivePatternAsFunction.fs.bsl            |  29 ++
 .../ActivePatternDefinition.fs                |   0
 .../ActivePatternDefinition.fs.bsl            |  62 +--
 .../ActivePatternIdentifierInPrivateMember.fs |   0
 ...ivePatternIdentifierInPrivateMember.fs.bsl |  48 +--
 .../CustomOperatorDefinition.fs               |   0
 .../CustomOperatorDefinition.fs.bsl           |  38 +-
 ...etectDifferenceBetweenCompiledOperators.fs |   0
 ...tDifferenceBetweenCompiledOperators.fs.bsl |  41 ++
 .../{ => OperatorName}/InfixOperation.fs      |   0
 .../OperatorName/InfixOperation.fs.bsl        |  27 ++
 .../{ => OperatorName}/NamedParameter.fs      |   0
 .../OperatorName/NamedParameter.fs.bsl        |  35 ++
 .../{ => OperatorName}/NameofOperator.fs      |   0
 .../OperatorName/NameofOperator.fs.bsl        |  25 ++
 .../ObjectModelWithTwoMembers.fs              |   0
 .../ObjectModelWithTwoMembers.fs.bsl          |  87 ++--
 .../{ => OperatorName}/OperatorAsFunction.fs  |   0
 .../OperatorName/OperatorAsFunction.fs.bsl    |  34 ++
 .../OperatorInMemberDefinition.fs             |   0
 .../OperatorInMemberDefinition.fs.bsl         |  47 ++-
 .../OperatorNameInSynValSig.fsi               |   0
 .../OperatorNameInSynValSig.fsi.bsl           |  32 +-
 .../OperatorNameInValConstraint.fsi           |   0
 .../OperatorNameInValConstraint.fsi.bsl       |  71 ++--
 .../{ => OperatorName}/OptionalExpression.fs  |   0
 .../OperatorName/OptionalExpression.fs.bsl    |  38 ++
 .../PartialActivePatternAsFunction.fs         |   0
 .../PartialActivePatternAsFunction.fs.bsl     |  29 ++
 .../PartialActivePatternDefinition.fs         |   0
 .../PartialActivePatternDefinition.fs.bsl     |  93 +++++
 ...ctivePatternDefinitionWithoutParameters.fs |   0
 ...ePatternDefinitionWithoutParameters.fs.bsl |  47 +++
 .../{ => OperatorName}/PrefixOperation.fs     |   0
 .../OperatorName/PrefixOperation.fs.bsl       |  22 +
 .../PrefixOperationWithTwoCharacters.fs       |   0
 .../PrefixOperationWithTwoCharacters.fs.bsl   |  12 +-
 .../QualifiedOperatorExpression.fs            |   0
 .../QualifiedOperatorExpression.fs.bsl        |  39 +-
 .../data/SyntaxTree/OptionalExpression.fs.bsl |  33 --
 ...ParenthesesOfSynArgPatsNamePatPairs.fs.bsl |  67 ----
 ...ularStringAsParsedHashDirectiveArgument.fs |   0
 ...StringAsParsedHashDirectiveArgument.fs.bsl |  17 +
 ...IdentifierAsParsedHashDirectiveArgument.fs |   0
 ...tifierAsParsedHashDirectiveArgument.fs.bsl |  20 +
 ...uoteStringAsParsedHashDirectiveArgument.fs |   0
 ...StringAsParsedHashDirectiveArgument.fs.bsl |  17 +
 ...atimStringAsParsedHashDirectiveArgument.fs |   0
 ...StringAsParsedHashDirectiveArgument.fs.bsl |  17 +
 .../PartialActivePatternAsFunction.fs.bsl     |  28 --
 .../PartialActivePatternDefinition.fs.bsl     |  88 ----
 ...ePatternDefinitionWithoutParameters.fs.bsl |  47 ---
 .../SyntaxTree/{ => Pattern}/InHeadPattern.fs |   0
 .../SyntaxTree/Pattern/InHeadPattern.fs.bsl   |  48 +++
 .../{ => Pattern}/OperatorInMatchPattern.fs   |   0
 .../Pattern/OperatorInMatchPattern.fs.bsl     |  46 +++
 .../OperatorInSynPatLongIdent.fs              |   0
 .../Pattern/OperatorInSynPatLongIdent.fs.bsl  |  58 +++
 .../ParenthesesOfSynArgPatsNamePatPairs.fs    |   0
 ...ParenthesesOfSynArgPatsNamePatPairs.fs.bsl |  70 ++++
 ...PatPairsContainsTheRangeOfTheEqualsSign.fs |   0
 ...airsContainsTheRangeOfTheEqualsSign.fs.bsl |  48 +++
 .../SynPatOrContainsTheRangeOfTheBar.fs       |   0
 .../SynPatOrContainsTheRangeOfTheBar.fs.bsl   |  62 +++
 ...atRecordContainsTheRangeOfTheEqualsSign.fs |   0
 ...cordContainsTheRangeOfTheEqualsSign.fs.bsl |  57 +++
 .../data/SyntaxTree/PrefixOperation.fs.bsl    |  20 -
 .../SyntaxTree/PrivateKeywordHasRange.fs.bsl  |  50 ---
 .../RangeOfArrowInSynMatchClause.fs.bsl       |  37 --
 ...ArrowInSynMatchClauseWithWhenClause.fs.bsl |  51 ---
 .../data/SyntaxTree/RangeOfAttribute.fs.bsl   |  44 --
 ...nShouldBeIncludedInSynModuleDeclLet.fs.bsl |  59 ---
 ...IncludedInSynModuleDeclNestedModule.fs.bsl |  45 ---
 ...teShouldBeIncludedInSynTypeDefnSig.fsi.bsl |  46 ---
 .../RangeOfAttributeWithPath.fs.bsl           |  50 ---
 .../RangeOfAttributeWithTarget.fs.bsl         |  46 ---
 ...ipleSynMatchClausesInSynExprTryWith.fs.bsl |  76 ----
 ...ASingleSynMatchClauseInSynExprMatch.fs.bsl |  52 ---
 ...ingleSynMatchClauseInSynExprTryWith.fs.bsl |  50 ---
 ...ltipleSynMatchClausesInSynExprMatch.fs.bsl |  76 ----
 .../RangeOfEqualSignShouldBePresent.fs.bsl    |  26 --
 ...uldBePresentInLocalLetBinding,Typed.fs.bsl |  57 ---
 ...sentInSynModuleDeclLetBinding,Typed.fs.bsl |  49 ---
 ...nModuleDeclLetBindingWithAttributes.fs.bsl |  55 ---
 .../RangeOfMultipleSynMatchClause.fs.bsl      |  87 ----
 .../RangeOfSingleSynMatchClause.fs.bsl        |  73 ----
 ...OfSingleSynMatchClauseFollowedByBar.fs.bsl |  73 ----
 ...SingleSynMatchClauseWithMissingBody.fs.bsl |  71 ----
 ...tchClauseWithMissingBodyAndWhenExpr.fs.bsl |  81 ----
 ...ypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl |  63 ---
 .../RangeOfTypeShouldEndAtEndKeyword.fsi.bsl  |  31 --
 ...StringAsParsedHashDirectiveArgument.fs.bsl |  16 -
 .../EqualsTokenIsPresentInSynValSigMember.fsi |   0
 ...alsTokenIsPresentInSynValSigMember.fsi.bsl |  31 +-
 .../EqualsTokenIsPresentInSynValSigValue.fsi  |   0
 ...ualsTokenIsPresentInSynValSigValue.fsi.bsl |  19 +-
 .../LeadingKeywordInRecursiveTypes.fsi        |   0
 .../LeadingKeywordInRecursiveTypes.fsi.bsl    |  52 +++
 ...ShouldContainsTheRangeOfTheWithKeyword.fsi |   0
 ...ldContainsTheRangeOfTheWithKeyword.fsi.bsl |  32 +-
 ...estedTypeHasStaticTypeAsLeadingKeyword.fsi |   0
 ...dTypeHasStaticTypeAsLeadingKeyword.fsi.bsl |  30 +-
 ...SynExceptionDefnReprAndSynExceptionSig.fsi |   0
 ...xceptionDefnReprAndSynExceptionSig.fsi.bsl |  32 +-
 ...ributeShouldBeIncludedInSynTypeDefnSig.fsi |   0
 ...teShouldBeIncludedInSynTypeDefnSig.fsi.bsl |  46 +++
 ...eShouldBeIncludedInSynValSpfnAndMember.fsi |   0
 ...uldBeIncludedInSynValSpfnAndMember.fsi.bsl |  32 +-
 ...ibutesShouldBeIncludedInRecursiveTypes.fsi |   0
 ...esShouldBeIncludedInRecursiveTypes.fsi.bsl |  56 +--
 ...ceptionSigAndSynModuleSigDeclException.fsi |   0
 ...ionSigAndSynModuleSigDeclException.fsi.bsl |  36 +-
 ...peDefnSigDelegateOfShouldStartFromName.fsi |   0
 ...fnSigDelegateOfShouldStartFromName.fsi.bsl |  30 +-
 ...efnSigObjectModelShouldEndAtLastMember.fsi |   0
 ...igObjectModelShouldEndAtLastMember.fsi.bsl |  28 +-
 ...TypeDefnSigRecordShouldEndAtLastMember.fsi |   0
 ...DefnSigRecordShouldEndAtLastMember.fsi.bsl |  32 +-
 ...SynTypeDefnSigSimpleShouldEndAtLastVal.fsi |   0
 ...ypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl |  63 +++
 .../RangeOfTypeShouldEndAtEndKeyword.fsi      |   0
 .../RangeOfTypeShouldEndAtEndKeyword.fsi.bsl  |  36 ++
 ...ShouldContainsTheRangeOfTheWithKeyword.fsi |   0
 ...ldContainsTheRangeOfTheWithKeyword.fsi.bsl |  26 +-
 ...ShouldContainsTheRangeOfTheWithKeyword.fsi |   0
 ...ldContainsTheRangeOfTheWithKeyword.fsi.bsl |  30 +-
 ...ithEnumContainsTheRangeOfTheEqualsSign.fsi |   0
 ...numContainsTheRangeOfTheEqualsSign.fsi.bsl |  59 +++
 ...elClassContainsTheRangeOfTheEqualsSign.fsi |   0
 ...assContainsTheRangeOfTheEqualsSign.fsi.bsl |  35 ++
 ...elegateContainsTheRangeOfTheEqualsSign.fsi |   0
 ...ateContainsTheRangeOfTheEqualsSign.fsi.bsl |  30 +-
 ...thUnionContainsTheRangeOfTheEqualsSign.fsi |   0
 ...ionContainsTheRangeOfTheEqualsSign.fsi.bsl |  34 +-
 .../SynValSigContainsParameterNames.fsi       |   0
 .../SynValSigContainsParameterNames.fsi.bsl   |  47 ++-
 .../TriviaIsPresentInSynTypeDefnSig.fsi       |   0
 .../TriviaIsPresentInSynTypeDefnSig.fsi.bsl   |  86 ++--
 .../ValKeywordIsPresentInSynValSig.fsi        |   0
 .../ValKeywordIsPresentInSynValSig.fsi.bsl    |  27 +-
 .../SimpleLambdaHasArrowRange.fs.bsl          |  26 --
 .../SingleIfElseEndif,SignatureFile.fsi.bsl   |  35 --
 .../data/SyntaxTree/SingleIfElseEndif.fs.bsl  |  30 --
 .../SingleIfEndif,SignatureFile.fsi.bsl       |  31 --
 .../data/SyntaxTree/SingleIfEndif.fs.bsl      |  28 --
 .../SingleSynEnumCaseHasBarRange.fs.bsl       |  41 --
 .../SingleSynEnumCaseWithoutBar.fs.bsl        |  38 --
 .../{ => SourceIdentifier}/_LINE_.fs          |   0
 .../SyntaxTree/SourceIdentifier/_LINE_.fs.bsl |  16 +
 .../_SOURCEDIRECTORY_.fs                      |   0
 .../SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl |  18 +
 .../{ => SourceIdentifier}/_SOURCEFILE_.fs    |   0
 .../SourceIdentifier/_SOURCEFILE_.fs.bsl      |  18 +
 ...tifierAsParsedHashDirectiveArgument.fs.bsl |  19 -
 .../data/SyntaxTree/StaticLetKeyword.fs.bsl   |  48 ---
 .../SyntaxTree/StaticLetRecKeyword.fs.bsl     |  60 ---
 .../data/SyntaxTree/StaticValKeyword.fsi.bsl  |  41 --
 ...nConstBytesWithSynByteStringKindRegular.fs |   0
 ...stBytesWithSynByteStringKindRegular.fs.bsl |  20 +-
 ...ConstBytesWithSynByteStringKindVerbatim.fs |   0
 ...tBytesWithSynByteStringKindVerbatim.fs.bsl |  20 +-
 .../SynConstStringWithSynStringKindRegular.fs |   0
 ...ConstStringWithSynStringKindRegular.fs.bsl |  20 +-
 ...ConstStringWithSynStringKindTripleQuote.fs |   0
 ...tStringWithSynStringKindTripleQuote.fs.bsl |  18 +-
 ...SynConstStringWithSynStringKindVerbatim.fs |   0
 ...onstStringWithSynStringKindVerbatim.fs.bsl |  20 +-
 ...erpolatedStringWithSynStringKindRegular.fs |   0
 ...latedStringWithSynStringKindRegular.fs.bsl |  24 +-
 ...latedStringWithSynStringKindTripleQuote.fs |   0
 ...dStringWithSynStringKindTripleQuote.fs.bsl |  19 +-
 ...rpolatedStringWithSynStringKindVerbatim.fs |   0
 ...atedStringWithSynStringKindVerbatim.fs.bsl |  25 +-
 ...airsContainsTheRangeOfTheEqualsSign.fs.bsl |  47 ---
 ...eStartsAtAnd!AndEndsAfterExpression.fs.bsl |  58 ---
 .../SynExprAnonRecdWithStructKeyword.fs.bsl   |  26 --
 ...sTheRangeOfTheEqualsSignInTheFields.fs.bsl |  37 --
 .../SynExprDynamicDoesContainIdent.fs.bsl     |  16 -
 ...ynExprDynamicDoesContainParentheses.fs.bsl |  23 --
 ...rForContainsTheRangeOfTheEqualsSign.fs.bsl |  41 --
 ...BangContainsTheRangeOfTheEqualsSign.fs.bsl |  56 ---
 ...rsDoesNotContainTheRangeOfInKeyword.fs.bsl |  69 ----
 ...eBindingContainsTheRangeOfInKeyword.fs.bsl |  74 ----
 ...insTheRangeOfTheMatchAndWithKeyword.fs.bsl |  37 --
 ...insTheRangeOfTheMatchAndWithKeyword.fs.bsl |  37 --
 .../SynExprSetWithSynExprDynamic.fs.bsl       |  19 -
 ...tainsTheRangeOfTheTryAndWithKeyword.fs.bsl |  29 --
 ...tainsTheRangeOfTheTryAndWithKeyword.fs.bsl |  43 --
 .../{ => SynIdent}/IncompleteLongIdent.fs     |   0
 .../SynIdent/IncompleteLongIdent.fs.bsl       |  20 +
 .../SynMeasureParenHasCorrectRange.fs.bsl     |  37 --
 .../SynPatOrContainsTheRangeOfTheBar.fs.bsl   |  58 ---
 ...cordContainsTheRangeOfTheEqualsSign.fs.bsl |  57 ---
 .../NestedSynTypeOrInsideSynExprTraitCall.fs  |   0
 ...stedSynTypeOrInsideSynExprTraitCall.fs.bsl |  90 ++---
 .../SingleSynTypeInsideSynExprTraitCall.fs    |   0
 ...SingleSynTypeInsideSynExprTraitCall.fs.bsl | 116 +++---
 .../SynTypeOrInsideSynExprTraitCall.fs        |   0
 .../SynTypeOrInsideSynExprTraitCall.fs.bsl    |  76 ++--
 ...nTypeConstraintWhereTyparSupportsMember.fs |   0
 ...eConstraintWhereTyparSupportsMember.fs.bsl |  55 +--
 .../SynTypeOrWithAppTypeOnTheRightHandSide.fs |   0
 ...TypeOrWithAppTypeOnTheRightHandSide.fs.bsl |  50 +--
 ...eDoesIncludeLeadingParameterAttributes.fsi |   0
 ...sIncludeLeadingParameterAttributes.fsi.bsl |  58 +--
 ...peTupleDoesIncludeLeadingParameterName.fsi |   0
 ...pleDoesIncludeLeadingParameterName.fsi.bsl |  34 +-
 ...numContainsTheRangeOfTheEqualsSign.fsi.bsl |  59 ---
 ...assContainsTheRangeOfTheEqualsSign.fsi.bsl |  35 --
 ...EnumContainsTheRangeOfTheEqualsSign.fs.bsl |  58 ---
 ...DocContainsTheRangeOfTheTypeKeyword.fs.bsl |  58 ---
 .../SynTypeFunHasRangeOfArrow.fs.bsl          |  35 --
 .../SynTypeTupleWithStruct,Recovery.fs.bsl    |  52 ---
 .../data/SyntaxTree/SyntheticKeyword.fs.bsl   |  30 --
 ...StringAsParsedHashDirectiveArgument.fs.bsl |  16 -
 ...eCaptured,IfUsedInAnInvalidLocation.fs.bsl |  71 ----
 .../TupleInLambdaHasArrowRange.fs.bsl         |  64 ---
 ...turnTypeOfBindingShouldContainStars.fs.bsl | 131 ------
 ...ttributesInOptionalNamedMemberParameter.fs |   0
 ...butesInOptionalNamedMemberParameter.fs.bsl |  50 +--
 ...tipleSynEnumCaseContainsRangeOfConstant.fs |   0
 ...eSynEnumCaseContainsRangeOfConstant.fs.bsl |  56 +++
 .../NamedParametersInDelegateType.fs          |   0
 .../NamedParametersInDelegateType.fs.bsl      |  58 +--
 ...NestedTypeHasStaticTypeAsLeadingKeyword.fs |   0
 ...edTypeHasStaticTypeAsLeadingKeyword.fs.bsl |  30 +-
 ...fAttributeShouldBeIncludedInSynTypeDefn.fs |   0
 ...ributeShouldBeIncludedInSynTypeDefn.fs.bsl |  22 +-
 ...ributesShouldBeIncludedInRecursiveTypes.fs |   0
 ...tesShouldBeIncludedInRecursiveTypes.fs.bsl |  90 ++---
 ...ingleSynEnumCaseContainsRangeOfConstant.fs |   0
 ...eSynEnumCaseContainsRangeOfConstant.fs.bsl |  24 +-
 ...terfaceContainsTheRangeOfTheWithKeyword.fs |   0
 ...aceContainsTheRangeOfTheWithKeyword.fs.bsl |  47 +--
 ...tributeContainsTheRangeOfTheTypeKeyword.fs |   0
 ...uteContainsTheRangeOfTheTypeKeyword.fs.bsl |  27 +-
 ...ntationContainsTheRangeOfTheWithKeyword.fs |   0
 ...ionContainsTheRangeOfTheWithKeyword.fs.bsl |  30 +-
 ...WithEnumContainsTheRangeOfTheEqualsSign.fs |   0
 ...EnumContainsTheRangeOfTheEqualsSign.fs.bsl |  58 +++
 ...delClassContainsTheRangeOfTheEqualsSign.fs |   0
 ...lassContainsTheRangeOfTheEqualsSign.fs.bsl |  24 +-
 ...DelegateContainsTheRangeOfTheEqualsSign.fs |   0
 ...gateContainsTheRangeOfTheEqualsSign.fs.bsl |  28 +-
 ...hRecordContainsTheRangeOfTheWithKeyword.fs |   0
 ...ordContainsTheRangeOfTheWithKeyword.fs.bsl |  51 +--
 ...ithUnionContainsTheRangeOfTheEqualsSign.fs |   0
 ...nionContainsTheRangeOfTheEqualsSign.fs.bsl |  32 +-
 ...hXmlDocContainsTheRangeOfTheTypeKeyword.fs |   0
 ...DocContainsTheRangeOfTheTypeKeyword.fs.bsl |  59 +++
 .../{ => Type}/SynTypeFunHasRangeOfArrow.fs   |   0
 .../Type/SynTypeFunHasRangeOfArrow.fs.bsl     |  38 ++
 .../{ => Type}/SynTypeTupleWithStruct.fs      |   0
 .../{ => Type}/SynTypeTupleWithStruct.fs.bsl  |  34 +-
 .../SynTypeTupleWithStructRecovery.fs}        |   0
 .../SynTypeTupleWithStructRecovery.fs.bsl     |  54 +++
 .../MultipleSynUnionCasesHaveBarRange.fs      |   0
 .../MultipleSynUnionCasesHaveBarRange.fs.bsl  |  33 +-
 .../{ => UnionCase}/PrivateKeywordHasRange.fs |   0
 .../UnionCase/PrivateKeywordHasRange.fs.bsl   |  56 +++
 .../SingleSynUnionCaseHasBarRange.fs          |   0
 .../SingleSynUnionCaseHasBarRange.fs.bsl      |  27 +-
 .../SingleSynUnionCaseWithoutBar.fs           |   0
 .../SingleSynUnionCaseWithoutBar.fs.bsl       |  25 +-
 .../SynUnionCaseKindFullType.fs               |   0
 .../SynUnionCaseKindFullType.fs.bsl           |  33 +-
 .../UnionCaseFieldsCanHaveComments.fs         |   0
 .../UnionCaseFieldsCanHaveComments.fs.bsl     |  29 +-
 .../service/data/SyntaxTree/UseKeyword.fs.bsl |  34 --
 .../data/SyntaxTree/UseRecKeyword.fs.bsl      |  37 --
 .../SyntaxTree/{ => Val}/InlineKeyword.fsi    |   0
 .../data/SyntaxTree/Val/InlineKeyword.fsi.bsl |  27 ++
 .../data/SyntaxTree/ValKeyword.fsi.bsl        |  31 --
 ...StringAsParsedHashDirectiveArgument.fs.bsl |  16 -
 tests/service/data/SyntaxTree/_LINE_.fs.bsl   |  13 -
 .../data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl  |  16 -
 .../data/SyntaxTree/_SOURCEFILE_.fs.bsl       |  15 -
 689 files changed, 9582 insertions(+), 8870 deletions(-)
 delete mode 100644 tests/service/data/SyntaxTree/ActivePatternAsFunction.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Attribute}/RangeOfAttribute.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Attribute}/RangeOfAttributeWithPath.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Attribute}/RangeOfAttributeWithTarget.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Binding}/ColonBeforeReturnTypeIsPartOfTrivia.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl (57%)
 rename tests/service/data/SyntaxTree/{ => Binding}/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl (59%)
 rename tests/service/data/SyntaxTree/{ => Binding}/ConditionalDirectiveAroundInlineKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/ConditionalDirectiveAroundInlineKeyword.fs.bsl (51%)
 rename tests/service/data/SyntaxTree/{ => Binding}/InlineKeywordInBinding.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/InlineKeywordInBinding.fs.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl (53%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl (55%)
 rename tests/service/data/SyntaxTree/{RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs => Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs} (100%)
 rename tests/service/data/SyntaxTree/{RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs.bsl => Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl} (53%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl (57%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl (57%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl (52%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl (56%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl (53%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl (56%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl (52%)
 rename tests/service/data/SyntaxTree/{RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs => Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs} (100%)
 create mode 100644 tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfEqualSignShouldBePresentInMemberBinding.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl (60%)
 rename tests/service/data/SyntaxTree/{RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs => Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs} (100%)
 rename tests/service/data/SyntaxTree/{RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs.bsl => Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl} (53%)
 rename tests/service/data/SyntaxTree/{RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs => Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs} (100%)
 rename tests/service/data/SyntaxTree/{RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs.bsl => Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl} (53%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfEqualSignShouldBePresentInProperty.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfEqualSignShouldBePresentInProperty.fs.bsl (62%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl (52%)
 rename tests/service/data/SyntaxTree/{RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs => Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs} (100%)
 create mode 100644 tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl (58%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl (53%)
 rename tests/service/data/SyntaxTree/{ => Binding}/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Binding}/TupleReturnTypeOfBindingShouldContainStars.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
 rename tests/service/data/SyntaxTree/{ => CodeComment}/BlockCommentInSourceCode.fs (100%)
 rename tests/service/data/SyntaxTree/{ => CodeComment}/BlockCommentInSourceCode.fs.bsl (50%)
 rename tests/service/data/SyntaxTree/{BlockCommentInSourceCode,SignatureFile.fsi => CodeComment/BlockCommentInSourceCodeSignatureFile.fsi} (100%)
 rename tests/service/data/SyntaxTree/{BlockCommentInSourceCode,SignatureFile.fsi.bsl => CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl} (54%)
 rename tests/service/data/SyntaxTree/{ => CodeComment}/CommentAfterSourceCode.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl
 rename tests/service/data/SyntaxTree/{CommentAfterSourceCode,SignatureFile.fsi => CodeComment/CommentAfterSourceCodeSignatureFile.fsi} (100%)
 rename tests/service/data/SyntaxTree/{CommentAfterSourceCode,SignatureFile.fsi.bsl => CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl} (53%)
 rename tests/service/data/SyntaxTree/{ => CodeComment}/CommentAtEndOfFile.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl
 rename tests/service/data/SyntaxTree/{ => CodeComment}/CommentOnSingleLine.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl
 rename tests/service/data/SyntaxTree/{CommentOnSingleLine,SignatureFile.fsi => CodeComment/CommentOnSingleLineSignatureFile.fsi} (100%)
 create mode 100644 tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl
 rename tests/service/data/SyntaxTree/{TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs => CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs} (100%)
 create mode 100644 tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl
 rename tests/service/data/SyntaxTree/{ => CodeComment}/TripleSlashCommentShouldNotBeCaptured.fs (100%)
 rename tests/service/data/SyntaxTree/{ => CodeComment}/TripleSlashCommentShouldNotBeCaptured.fs.bsl (54%)
 delete mode 100644 tests/service/data/SyntaxTree/CommentAfterSourceCode.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/CommentAtEndOfFile.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/CommentOnSingleLine.fs.bsl
 rename tests/service/data/SyntaxTree/{MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs => ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs} (100%)
 create mode 100644 tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl
 rename tests/service/data/SyntaxTree/{SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs => ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs} (100%)
 create mode 100644 tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl
 rename tests/service/data/SyntaxTree/{ => ConditionalDirective}/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
 rename tests/service/data/SyntaxTree/{DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi => ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi} (100%)
 create mode 100644 tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => ConditionalDirective}/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (100%)
 rename tests/service/data/SyntaxTree/{ => ConditionalDirective}/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl (51%)
 rename tests/service/data/SyntaxTree/{DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi => ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi} (100%)
 create mode 100644 tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => ConditionalDirective}/NestedIfElseEndif.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl
 rename tests/service/data/SyntaxTree/{NestedIfElseEndif,SignatureFile.fsi => ConditionalDirective/NestedIfElseEndifSignatureFile.fsi} (100%)
 create mode 100644 tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => ConditionalDirective}/NestedIfEndifWithComplexExpressions.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl
 rename tests/service/data/SyntaxTree/{NestedIfEndifWithComplexExpressions,SignatureFile.fsi => ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi} (100%)
 create mode 100644 tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => ConditionalDirective}/SingleIfElseEndif.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl
 rename tests/service/data/SyntaxTree/{SingleIfElseEndif,SignatureFile.fsi => ConditionalDirective/SingleIfElseEndifSignatureFile.fsi} (100%)
 create mode 100644 tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => ConditionalDirective}/SingleIfEndif.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl
 rename tests/service/data/SyntaxTree/{SingleIfEndif,SignatureFile.fsi => ConditionalDirective/SingleIfEndifSignatureFile.fsi} (100%)
 create mode 100644 tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/DoKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/DoStaticKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs.bsl
 rename tests/service/data/SyntaxTree/{ => EnumCase}/MultipleSynEnumCasesHaveBarRange.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl
 rename tests/service/data/SyntaxTree/{ => EnumCase}/SingleSynEnumCaseHasBarRange.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl
 rename tests/service/data/SyntaxTree/{ => EnumCase}/SingleSynEnumCaseWithoutBar.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Exception}/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Exception}/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => Expression}/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Expression}/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl (50%)
 rename tests/service/data/SyntaxTree/{ => Expression}/GlobalKeywordAsSynExpr.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Expression}/GlobalKeywordAsSynExpr.fs.bsl (60%)
 rename tests/service/data/SyntaxTree/{ => Expression}/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Expression}/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Expression}/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl (52%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprAnonRecdWithStructKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprDoContainsTheRangeOfTheDoKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl (55%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprDynamicDoesContainIdent.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprDynamicDoesContainParentheses.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprForContainsTheRangeOfTheEqualsSign.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl (51%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl (51%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprObjExprContainsTheRangeOfWithKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl (53%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprObjWithSetter.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprObjWithSetter.fs.bsl (56%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl (50%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprSetWithSynExprDynamic.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Expression}/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Extern}/ExternKeywordIsPresentInTrivia.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Extern}/ExternKeywordIsPresentInTrivia.fs.bsl (60%)
 delete mode 100644 tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs.bsl
 rename tests/service/data/SyntaxTree/{ => IfThenElse}/CommentBetweenElseAndIf.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/IfThenElse/CommentBetweenElseAndIf.fs.bsl
 rename tests/service/data/SyntaxTree/{ => IfThenElse}/DeeplyNestedIfThenElse.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl
 rename tests/service/data/SyntaxTree/{ => IfThenElse}/ElseKeywordInSimpleIfThenElse.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl
 rename tests/service/data/SyntaxTree/{ => IfThenElse}/IfKeywordInIfThenElse.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl
 rename tests/service/data/SyntaxTree/{If,ThenAndElseKeywordOnSeparateLines.fs => IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs} (100%)
 create mode 100644 tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl
 rename tests/service/data/SyntaxTree/{ => IfThenElse}/NestedElifInIfThenElse.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl
 rename tests/service/data/SyntaxTree/{ => IfThenElse}/NestedElseIfInIfThenElse.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl
 rename tests/service/data/SyntaxTree/{ => IfThenElse}/NestedElseIfOnTheSameLineInIfThenElse.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/InHeadPattern.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/IncompleteLongIdent.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/InfixOperation.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/InlineKeyword.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => Lambda}/ComplexArgumentsLambdaHasArrowRange.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Lambda}/ComplexArgumentsLambdaHasArrowRange.fs.bsl (51%)
 rename tests/service/data/SyntaxTree/{ => Lambda}/DestructedLambdaHasArrowRange.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Lambda}/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Lambda}/LambdaWithTwoParametersGivesCorrectBody.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Lambda}/LambdaWithWildCardParameterGivesCorrectBody.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Lambda}/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Lambda}/MultilineLambdaHasArrowRange.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Lambda}/MultilineLambdaHasArrowRange.fs.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => Lambda}/SimpleLambdaHasArrowRange.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Lambda}/TupleInLambdaHasArrowRange.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/AbstractKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/AbstractKeyword.fs.bsl (57%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/AbstractMemberKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/AbstractMemberKeyword.fs.bsl (60%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/AndKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/AndKeyword.fs.bsl (50%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/DefaultKeyword.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/DefaultKeyword.fsi.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/DefaultValKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/DefaultValKeyword.fs.bsl (53%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/DoKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/DoStaticKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/ExternKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/ExternKeyword.fs.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/LetKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/LetRecKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/MemberKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/MemberValKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/MemberValKeyword.fs.bsl (52%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/NewKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/NewKeyword.fs.bsl (51%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/OverrideKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/OverrideKeyword.fs.bsl (53%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/OverrideValKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/OverrideValKeyword.fs.bsl (59%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/StaticAbstractKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/StaticAbstractKeyword.fs.bsl (59%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/StaticAbstractMemberKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/StaticAbstractMemberKeyword.fs.bsl (58%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/StaticLetKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/StaticLetRecKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/StaticMemberKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/StaticMemberKeyword.fs.bsl (56%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/StaticMemberValKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/StaticMemberValKeyword.fs.bsl (59%)
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/StaticValKeyword.fsi (100%)
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/SyntheticKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/UseKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/UseRecKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => LeadingKeyword}/ValKeyword.fsi (100%)
 create mode 100644 tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/LetKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/LetRecKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => MatchClause}/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
 rename tests/service/data/SyntaxTree/{ => MatchClause}/RangeOfArrowInSynMatchClause.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl
 rename tests/service/data/SyntaxTree/{ => MatchClause}/RangeOfArrowInSynMatchClauseWithWhenClause.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
 rename tests/service/data/SyntaxTree/{ => MatchClause}/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
 rename tests/service/data/SyntaxTree/{ => MatchClause}/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
 rename tests/service/data/SyntaxTree/{ => MatchClause}/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
 rename tests/service/data/SyntaxTree/{ => MatchClause}/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
 rename tests/service/data/SyntaxTree/{ => MatchClause}/RangeOfMultipleSynMatchClause.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl
 rename tests/service/data/SyntaxTree/{ => MatchClause}/RangeOfSingleSynMatchClause.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl
 rename tests/service/data/SyntaxTree/{ => MatchClause}/RangeOfSingleSynMatchClauseFollowedByBar.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
 rename tests/service/data/SyntaxTree/{ => MatchClause}/RangeOfSingleSynMatchClauseWithMissingBody.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
 rename tests/service/data/SyntaxTree/{ => MatchClause}/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Measure}/MeasureContainsTheRangeOfTheConstant.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Measure}/SynMeasureParenHasCorrectRange.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Measure}/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Measure}/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl (52%)
 rename tests/service/data/SyntaxTree/{ => Measure}/SynTypeTupleInMeasureTypeWithNoSlashes.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Measure}/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => Measure}/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Measure}/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl (53%)
 delete mode 100644 tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Member}/GetSetMemberWithInlineKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/GetSetMemberWithInlineKeyword.fs.bsl (62%)
 rename tests/service/data/SyntaxTree/{ => Member}/ImplicitCtorWithAsKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/ImplicitCtorWithAsKeyword.fs.bsl (51%)
 rename tests/service/data/SyntaxTree/{ => Member}/MemberWithInlineKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/MemberWithInlineKeyword.fs.bsl (60%)
 rename tests/service/data/SyntaxTree/{ => Member}/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl (55%)
 rename tests/service/data/SyntaxTree/{ => Member}/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl (56%)
 rename tests/service/data/SyntaxTree/{ => Member}/SignatureMemberWithGet.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/SignatureMemberWithGet.fsi.bsl (58%)
 rename tests/service/data/SyntaxTree/{ => Member}/SignatureMemberWithSet.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/SignatureMemberWithSet.fsi.bsl (58%)
 rename tests/service/data/SyntaxTree/{SignatureMemberWithSet,get.fsi => Member/SignatureMemberWithSetget.fsi} (100%)
 rename tests/service/data/SyntaxTree/{SignatureMemberWithSet,get.fsi.bsl => Member/SignatureMemberWithSetget.fsi.bsl} (59%)
 rename tests/service/data/SyntaxTree/{ => Member}/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl (56%)
 rename tests/service/data/SyntaxTree/{ => Member}/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl (53%)
 rename tests/service/data/SyntaxTree/{ => Member}/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl (59%)
 rename tests/service/data/SyntaxTree/{ => Member}/SynTypeDefnWithMemberWithGetHasXmlComment.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl (60%)
 rename tests/service/data/SyntaxTree/{ => Member}/SynTypeDefnWithMemberWithSetget.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/SynTypeDefnWithMemberWithSetget.fs.bsl (62%)
 rename tests/service/data/SyntaxTree/{ => Member}/SynTypeDefnWithStaticMemberWithGetset.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/SynTypeDefnWithStaticMemberWithGetset.fs.bsl (55%)
 rename tests/service/data/SyntaxTree/{ => Member}/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Member}/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl (56%)
 rename tests/service/data/SyntaxTree/{ => MemberFlag}/SynExprObjMembersHaveCorrectKeywords.fs (100%)
 rename tests/service/data/SyntaxTree/{ => MemberFlag}/SynExprObjMembersHaveCorrectKeywords.fs.bsl (60%)
 rename tests/service/data/SyntaxTree/{ => MemberFlag}/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => MemberFlag}/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl (67%)
 rename tests/service/data/SyntaxTree/{ => MemberFlag}/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => MemberFlag}/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl (66%)
 rename tests/service/data/SyntaxTree/{ => MemberFlag}/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => MemberFlag}/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl (57%)
 rename tests/service/data/SyntaxTree/{ => MemberFlag}/SynMemberSigMemberHasCorrectKeywords.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => MemberFlag}/SynMemberSigMemberHasCorrectKeywords.fsi.bsl (72%)
 delete mode 100644 tests/service/data/SyntaxTree/MemberKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespace}/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespace}/GlobalInOpenPathShouldContainTrivia.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespace}/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespace}/ModuleRangeShouldStartAtFirstAttribute.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespace}/ModuleShouldContainModuleKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespace}/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespace}/NamespaceShouldContainNamespaceKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespaceSig}/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespaceSig}/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl (53%)
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespaceSig}/ModuleRangeShouldStartAtFirstAttribute.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespaceSig}/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl (55%)
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespaceSig}/ModuleShouldContainModuleKeyword.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespaceSig}/ModuleShouldContainModuleKeyword.fsi.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespaceSig}/NamespaceShouldContainNamespaceKeyword.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespaceSig}/NamespaceShouldContainNamespaceKeyword.fsi.bsl (55%)
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespaceSig}/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => ModuleOrNamespaceSig}/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl (55%)
 delete mode 100644 tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/NamedParameter.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/NameofOperator.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/NestedIfElseEndif.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs.bsl
 rename tests/service/data/SyntaxTree/{ => NestedModule}/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
 rename tests/service/data/SyntaxTree/{ => NestedModule}/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => NestedModule}/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl (51%)
 rename tests/service/data/SyntaxTree/{ => NestedModule}/RangeOfEqualSignShouldBePresent.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl
 rename tests/service/data/SyntaxTree/{RangeOfEqualSignShouldBePresent,SignatureFile.fsi => NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi} (100%)
 rename tests/service/data/SyntaxTree/{RangeOfEqualSignShouldBePresent,SignatureFile.fsi.bsl => NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl} (52%)
 rename tests/service/data/SyntaxTree/{ => NestedModule}/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => NestedModule}/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl (52%)
 delete mode 100644 tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/OperatorAsFunction.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/OperatorInMatchPattern.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs.bsl
 rename tests/service/data/SyntaxTree/{ => OperatorName}/ActivePatternAsFunction.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl
 rename tests/service/data/SyntaxTree/{ => OperatorName}/ActivePatternDefinition.fs (100%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/ActivePatternDefinition.fs.bsl (50%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/ActivePatternIdentifierInPrivateMember.fs (100%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/ActivePatternIdentifierInPrivateMember.fs.bsl (57%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/CustomOperatorDefinition.fs (100%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/CustomOperatorDefinition.fs.bsl (52%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/DetectDifferenceBetweenCompiledOperators.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl
 rename tests/service/data/SyntaxTree/{ => OperatorName}/InfixOperation.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl
 rename tests/service/data/SyntaxTree/{ => OperatorName}/NamedParameter.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl
 rename tests/service/data/SyntaxTree/{ => OperatorName}/NameofOperator.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl
 rename tests/service/data/SyntaxTree/{ => OperatorName}/ObjectModelWithTwoMembers.fs (100%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/ObjectModelWithTwoMembers.fs.bsl (61%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/OperatorAsFunction.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl
 rename tests/service/data/SyntaxTree/{ => OperatorName}/OperatorInMemberDefinition.fs (100%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/OperatorInMemberDefinition.fs.bsl (60%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/OperatorNameInSynValSig.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/OperatorNameInSynValSig.fsi.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/OperatorNameInValConstraint.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/OperatorNameInValConstraint.fsi.bsl (52%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/OptionalExpression.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl
 rename tests/service/data/SyntaxTree/{ => OperatorName}/PartialActivePatternAsFunction.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl
 rename tests/service/data/SyntaxTree/{ => OperatorName}/PartialActivePatternDefinition.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl
 rename tests/service/data/SyntaxTree/{ => OperatorName}/PartialActivePatternDefinitionWithoutParameters.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl
 rename tests/service/data/SyntaxTree/{ => OperatorName}/PrefixOperation.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl
 rename tests/service/data/SyntaxTree/{ => OperatorName}/PrefixOperationWithTwoCharacters.fs (100%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/PrefixOperationWithTwoCharacters.fs.bsl (56%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/QualifiedOperatorExpression.fs (100%)
 rename tests/service/data/SyntaxTree/{ => OperatorName}/QualifiedOperatorExpression.fs.bsl (51%)
 delete mode 100644 tests/service/data/SyntaxTree/OptionalExpression.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
 rename tests/service/data/SyntaxTree/{ => ParsedHashDirective}/RegularStringAsParsedHashDirectiveArgument.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl
 rename tests/service/data/SyntaxTree/{ => ParsedHashDirective}/SourceIdentifierAsParsedHashDirectiveArgument.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
 rename tests/service/data/SyntaxTree/{ => ParsedHashDirective}/TripleQuoteStringAsParsedHashDirectiveArgument.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
 rename tests/service/data/SyntaxTree/{ => ParsedHashDirective}/VerbatimStringAsParsedHashDirectiveArgument.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Pattern}/InHeadPattern.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Pattern}/OperatorInMatchPattern.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Pattern}/OperatorInSynPatLongIdent.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Pattern}/ParenthesesOfSynArgPatsNamePatPairs.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Pattern}/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Pattern}/SynPatOrContainsTheRangeOfTheBar.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Pattern}/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/PrefixOperation.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfAttribute.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs.bsl
 rename tests/service/data/SyntaxTree/{ => SignatureType}/EqualsTokenIsPresentInSynValSigMember.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/EqualsTokenIsPresentInSynValSigMember.fsi.bsl (58%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/EqualsTokenIsPresentInSynValSigValue.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/EqualsTokenIsPresentInSynValSigValue.fsi.bsl (53%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/LeadingKeywordInRecursiveTypes.fsi (100%)
 create mode 100644 tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => SignatureType}/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl (50%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl (50%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl (53%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (100%)
 create mode 100644 tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl (57%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl (59%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl (57%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl (58%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (100%)
 create mode 100644 tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => SignatureType}/RangeOfTypeShouldEndAtEndKeyword.fsi (100%)
 create mode 100644 tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => SignatureType}/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl (57%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (100%)
 create mode 100644 tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => SignatureType}/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (100%)
 create mode 100644 tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => SignatureType}/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl (56%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl (58%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/SynValSigContainsParameterNames.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/SynValSigContainsParameterNames.fsi.bsl (59%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/TriviaIsPresentInSynTypeDefnSig.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/TriviaIsPresentInSynTypeDefnSig.fsi.bsl (52%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/ValKeywordIsPresentInSynValSig.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SignatureType}/ValKeywordIsPresentInSynValSig.fsi.bsl (51%)
 delete mode 100644 tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SingleIfElseEndif.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SingleIfEndif.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs.bsl
 rename tests/service/data/SyntaxTree/{ => SourceIdentifier}/_LINE_.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl
 rename tests/service/data/SyntaxTree/{ => SourceIdentifier}/_SOURCEDIRECTORY_.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl
 rename tests/service/data/SyntaxTree/{ => SourceIdentifier}/_SOURCEFILE_.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/StaticLetKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/StaticLetRecKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/StaticValKeyword.fsi.bsl
 rename tests/service/data/SyntaxTree/{ => String}/SynConstBytesWithSynByteStringKindRegular.fs (100%)
 rename tests/service/data/SyntaxTree/{ => String}/SynConstBytesWithSynByteStringKindRegular.fs.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => String}/SynConstBytesWithSynByteStringKindVerbatim.fs (100%)
 rename tests/service/data/SyntaxTree/{ => String}/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => String}/SynConstStringWithSynStringKindRegular.fs (100%)
 rename tests/service/data/SyntaxTree/{ => String}/SynConstStringWithSynStringKindRegular.fs.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => String}/SynConstStringWithSynStringKindTripleQuote.fs (100%)
 rename tests/service/data/SyntaxTree/{ => String}/SynConstStringWithSynStringKindTripleQuote.fs.bsl (56%)
 rename tests/service/data/SyntaxTree/{ => String}/SynConstStringWithSynStringKindVerbatim.fs (100%)
 rename tests/service/data/SyntaxTree/{ => String}/SynConstStringWithSynStringKindVerbatim.fs.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => String}/SynExprInterpolatedStringWithSynStringKindRegular.fs (100%)
 rename tests/service/data/SyntaxTree/{ => String}/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl (52%)
 rename tests/service/data/SyntaxTree/{ => String}/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (100%)
 rename tests/service/data/SyntaxTree/{ => String}/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => String}/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (100%)
 rename tests/service/data/SyntaxTree/{ => String}/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl (53%)
 delete mode 100644 tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => SynIdent}/IncompleteLongIdent.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
 rename tests/service/data/SyntaxTree/{ => SynType}/NestedSynTypeOrInsideSynExprTraitCall.fs (100%)
 rename tests/service/data/SyntaxTree/{ => SynType}/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl (51%)
 rename tests/service/data/SyntaxTree/{ => SynType}/SingleSynTypeInsideSynExprTraitCall.fs (100%)
 rename tests/service/data/SyntaxTree/{ => SynType}/SingleSynTypeInsideSynExprTraitCall.fs.bsl (64%)
 rename tests/service/data/SyntaxTree/{ => SynType}/SynTypeOrInsideSynExprTraitCall.fs (100%)
 rename tests/service/data/SyntaxTree/{ => SynType}/SynTypeOrInsideSynExprTraitCall.fs.bsl (52%)
 rename tests/service/data/SyntaxTree/{ => SynType}/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (100%)
 rename tests/service/data/SyntaxTree/{ => SynType}/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl (57%)
 rename tests/service/data/SyntaxTree/{ => SynType}/SynTypeOrWithAppTypeOnTheRightHandSide.fs (100%)
 rename tests/service/data/SyntaxTree/{ => SynType}/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl (55%)
 rename tests/service/data/SyntaxTree/{ => SynType}/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SynType}/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl (63%)
 rename tests/service/data/SyntaxTree/{ => SynType}/SynTypeTupleDoesIncludeLeadingParameterName.fsi (100%)
 rename tests/service/data/SyntaxTree/{ => SynType}/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl (62%)
 delete mode 100644 tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/SyntheticKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Type}/AttributesInOptionalNamedMemberParameter.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/AttributesInOptionalNamedMemberParameter.fs.bsl (63%)
 rename tests/service/data/SyntaxTree/{ => Type}/MultipleSynEnumCaseContainsRangeOfConstant.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Type}/NamedParametersInDelegateType.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/NamedParametersInDelegateType.fs.bsl (62%)
 rename tests/service/data/SyntaxTree/{ => Type}/NestedTypeHasStaticTypeAsLeadingKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl (52%)
 rename tests/service/data/SyntaxTree/{ => Type}/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl (55%)
 rename tests/service/data/SyntaxTree/{ => Type}/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl (53%)
 rename tests/service/data/SyntaxTree/{ => Type}/SingleSynEnumCaseContainsRangeOfConstant.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl (52%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl (58%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl (50%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl (57%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl (54%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl (61%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl (57%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl (62%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeFunHasRangeOfArrow.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeTupleWithStruct.fs (100%)
 rename tests/service/data/SyntaxTree/{ => Type}/SynTypeTupleWithStruct.fs.bsl (50%)
 rename tests/service/data/SyntaxTree/{SynTypeTupleWithStruct,Recovery.fs => Type/SynTypeTupleWithStructRecovery.fs} (100%)
 create mode 100644 tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl
 rename tests/service/data/SyntaxTree/{ => UnionCase}/MultipleSynUnionCasesHaveBarRange.fs (100%)
 rename tests/service/data/SyntaxTree/{ => UnionCase}/MultipleSynUnionCasesHaveBarRange.fs.bsl (61%)
 rename tests/service/data/SyntaxTree/{ => UnionCase}/PrivateKeywordHasRange.fs (100%)
 create mode 100644 tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl
 rename tests/service/data/SyntaxTree/{ => UnionCase}/SingleSynUnionCaseHasBarRange.fs (100%)
 rename tests/service/data/SyntaxTree/{ => UnionCase}/SingleSynUnionCaseHasBarRange.fs.bsl (58%)
 rename tests/service/data/SyntaxTree/{ => UnionCase}/SingleSynUnionCaseWithoutBar.fs (100%)
 rename tests/service/data/SyntaxTree/{ => UnionCase}/SingleSynUnionCaseWithoutBar.fs.bsl (60%)
 rename tests/service/data/SyntaxTree/{ => UnionCase}/SynUnionCaseKindFullType.fs (100%)
 rename tests/service/data/SyntaxTree/{ => UnionCase}/SynUnionCaseKindFullType.fs.bsl (55%)
 rename tests/service/data/SyntaxTree/{ => UnionCase}/UnionCaseFieldsCanHaveComments.fs (100%)
 rename tests/service/data/SyntaxTree/{ => UnionCase}/UnionCaseFieldsCanHaveComments.fs.bsl (61%)
 delete mode 100644 tests/service/data/SyntaxTree/UseKeyword.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/UseRecKeyword.fs.bsl
 rename tests/service/data/SyntaxTree/{ => Val}/InlineKeyword.fsi (100%)
 create mode 100644 tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/ValKeyword.fsi.bsl
 delete mode 100644 tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/_LINE_.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl
 delete mode 100644 tests/service/data/SyntaxTree/_SOURCEFILE_.fs.bsl

diff --git a/tests/service/SyntaxTreeTests.fs b/tests/service/SyntaxTreeTests.fs
index e0930721811..6d4b7b17ee1 100644
--- a/tests/service/SyntaxTreeTests.fs
+++ b/tests/service/SyntaxTreeTests.fs
@@ -7,13 +7,12 @@ open FSharp.Compiler.Text
 open NUnit.Framework
 
 let testCasesDir = Path.Combine(__SOURCE_DIRECTORY__, "data", "SyntaxTree")
-let fsharpFiles = set [| ".fs"; ".fsi"; ".fsx" |]
 
 let allTestCases =
-    Directory.EnumerateFiles(testCasesDir)
-    |> Seq.filter (fun file -> FileInfo(file).Extension |> fsharpFiles.Contains)
+    Directory.EnumerateFiles(testCasesDir, "*.fs?", SearchOption.AllDirectories)
     |> Seq.map (fun f ->
-        let fileName = Path.GetFileName f
+        let fileInfo = FileInfo(f)
+        let fileName = Path.Combine(fileInfo.Directory.Name, fileInfo.Name)
         [| fileName :> obj |])
     |> Seq.toArray
 
diff --git a/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs.bsl
deleted file mode 100644
index 2aa7260d94f..00000000000
--- a/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs.bsl
+++ /dev/null
@@ -1,25 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/ActivePatternAsFunction.fs", false,
-      QualifiedNameOfFile ActivePatternAsFunction, [], [],
-      [SynModuleOrNamespace
-         ([ActivePatternAsFunction], false, AnonModule,
-          [Expr
-             (App
-                (NonAtomic, false,
-                 LongIdent
-                   (false,
-                    SynLongIdent
-                      ([|Odd|Even|], [],
-                       [Some
-                          (HasParenthesis
-                             (/root/ActivePatternAsFunction.fs (2,0--2,1),
-                              /root/ActivePatternAsFunction.fs (2,11--2,12)))]),
-                    None, /root/ActivePatternAsFunction.fs (2,0--2,12)),
-                 Const (Int32 4, /root/ActivePatternAsFunction.fs (2,13--2,14)),
-                 /root/ActivePatternAsFunction.fs (2,0--2,14)),
-              /root/ActivePatternAsFunction.fs (2,0--2,14))], PreXmlDocEmpty, [],
-          None, /root/ActivePatternAsFunction.fs (2,0--2,14),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttribute.fs b/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttribute.fs
rename to tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs
diff --git a/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl b/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl
new file mode 100644
index 00000000000..b787cc3ebb1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl
@@ -0,0 +1,46 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Attribute/RangeOfAttribute.fs", false,
+      QualifiedNameOfFile RangeOfAttribute, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttribute], false, AnonModule,
+          [Attributes
+             ([{ Attributes =
+                  [{ TypeName = SynLongIdent ([MyAttribute], [], [None])
+                     ArgExpr =
+                      Paren
+                        (App
+                           (NonAtomic, false,
+                            App
+                              (NonAtomic, true,
+                               LongIdent
+                                 (false,
+                                  SynLongIdent
+                                    ([op_Equality], [],
+                                     [Some (OriginalNotation "=")]), None,
+                                  /root/Attribute/RangeOfAttribute.fs (2,18--2,19)),
+                               Ident foo,
+                               /root/Attribute/RangeOfAttribute.fs (2,14--2,19)),
+                            Const
+                              (String
+                                 ("bar", Regular,
+                                  /root/Attribute/RangeOfAttribute.fs (2,19--2,24)),
+                               /root/Attribute/RangeOfAttribute.fs (2,19--2,24)),
+                            /root/Attribute/RangeOfAttribute.fs (2,14--2,24)),
+                         /root/Attribute/RangeOfAttribute.fs (2,13--2,14),
+                         Some /root/Attribute/RangeOfAttribute.fs (2,24--2,25),
+                         /root/Attribute/RangeOfAttribute.fs (2,13--2,25))
+                     Target = None
+                     AppliesToGetterAndSetter = false
+                     Range = /root/Attribute/RangeOfAttribute.fs (2,2--2,25) }]
+                 Range = /root/Attribute/RangeOfAttribute.fs (2,0--2,27) }],
+              /root/Attribute/RangeOfAttribute.fs (2,0--2,27));
+           Expr
+             (Do
+                (Const (Unit, /root/Attribute/RangeOfAttribute.fs (3,3--3,5)),
+                 /root/Attribute/RangeOfAttribute.fs (3,0--3,5)),
+              /root/Attribute/RangeOfAttribute.fs (3,0--3,5))], PreXmlDocEmpty,
+          [], None, /root/Attribute/RangeOfAttribute.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs
rename to tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs
diff --git a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl
new file mode 100644
index 00000000000..016e21ba87d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl
@@ -0,0 +1,54 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Attribute/RangeOfAttributeWithPath.fs", false,
+      QualifiedNameOfFile RangeOfAttributeWithPath, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeWithPath], false, AnonModule,
+          [Attributes
+             ([{ Attributes =
+                  [{ TypeName =
+                      SynLongIdent
+                        ([Prefix; MyAttribute],
+                         [/root/Attribute/RangeOfAttributeWithPath.fs (2,8--2,9)],
+                         [None; None])
+                     ArgExpr =
+                      Paren
+                        (App
+                           (NonAtomic, false,
+                            App
+                              (NonAtomic, true,
+                               LongIdent
+                                 (false,
+                                  SynLongIdent
+                                    ([op_Equality], [],
+                                     [Some (OriginalNotation "=")]), None,
+                                  /root/Attribute/RangeOfAttributeWithPath.fs (2,25--2,26)),
+                               Ident foo,
+                               /root/Attribute/RangeOfAttributeWithPath.fs (2,21--2,26)),
+                            Const
+                              (String
+                                 ("bar", Regular,
+                                  /root/Attribute/RangeOfAttributeWithPath.fs (2,26--2,31)),
+                               /root/Attribute/RangeOfAttributeWithPath.fs (2,26--2,31)),
+                            /root/Attribute/RangeOfAttributeWithPath.fs (2,21--2,31)),
+                         /root/Attribute/RangeOfAttributeWithPath.fs (2,20--2,21),
+                         Some
+                           /root/Attribute/RangeOfAttributeWithPath.fs (2,31--2,32),
+                         /root/Attribute/RangeOfAttributeWithPath.fs (2,20--2,32))
+                     Target = None
+                     AppliesToGetterAndSetter = false
+                     Range =
+                      /root/Attribute/RangeOfAttributeWithPath.fs (2,2--2,32) }]
+                 Range = /root/Attribute/RangeOfAttributeWithPath.fs (2,0--2,34) }],
+              /root/Attribute/RangeOfAttributeWithPath.fs (2,0--2,34));
+           Expr
+             (Do
+                (Const
+                   (Unit, /root/Attribute/RangeOfAttributeWithPath.fs (3,3--3,5)),
+                 /root/Attribute/RangeOfAttributeWithPath.fs (3,0--3,5)),
+              /root/Attribute/RangeOfAttributeWithPath.fs (3,0--3,5))],
+          PreXmlDocEmpty, [], None,
+          /root/Attribute/RangeOfAttributeWithPath.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs
rename to tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs
diff --git a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl
new file mode 100644
index 00000000000..81eb0ba685b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl
@@ -0,0 +1,52 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Attribute/RangeOfAttributeWithTarget.fs", false,
+      QualifiedNameOfFile RangeOfAttributeWithTarget, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeWithTarget], false, AnonModule,
+          [Attributes
+             ([{ Attributes =
+                  [{ TypeName = SynLongIdent ([MyAttribute], [], [None])
+                     ArgExpr =
+                      Paren
+                        (App
+                           (NonAtomic, false,
+                            App
+                              (NonAtomic, true,
+                               LongIdent
+                                 (false,
+                                  SynLongIdent
+                                    ([op_Equality], [],
+                                     [Some (OriginalNotation "=")]), None,
+                                  /root/Attribute/RangeOfAttributeWithTarget.fs (2,28--2,29)),
+                               Ident foo,
+                               /root/Attribute/RangeOfAttributeWithTarget.fs (2,24--2,29)),
+                            Const
+                              (String
+                                 ("bar", Regular,
+                                  /root/Attribute/RangeOfAttributeWithTarget.fs (2,29--2,34)),
+                               /root/Attribute/RangeOfAttributeWithTarget.fs (2,29--2,34)),
+                            /root/Attribute/RangeOfAttributeWithTarget.fs (2,24--2,34)),
+                         /root/Attribute/RangeOfAttributeWithTarget.fs (2,23--2,24),
+                         Some
+                           /root/Attribute/RangeOfAttributeWithTarget.fs (2,34--2,35),
+                         /root/Attribute/RangeOfAttributeWithTarget.fs (2,23--2,35))
+                     Target = Some assembly
+                     AppliesToGetterAndSetter = false
+                     Range =
+                      /root/Attribute/RangeOfAttributeWithTarget.fs (2,2--2,35) }]
+                 Range =
+                  /root/Attribute/RangeOfAttributeWithTarget.fs (2,0--2,37) }],
+              /root/Attribute/RangeOfAttributeWithTarget.fs (2,0--2,37));
+           Expr
+             (Do
+                (Const
+                   (Unit,
+                    /root/Attribute/RangeOfAttributeWithTarget.fs (3,3--3,5)),
+                 /root/Attribute/RangeOfAttributeWithTarget.fs (3,0--3,5)),
+              /root/Attribute/RangeOfAttributeWithTarget.fs (3,0--3,5))],
+          PreXmlDocEmpty, [], None,
+          /root/Attribute/RangeOfAttributeWithTarget.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs
rename to tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs
diff --git a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
similarity index 57%
rename from tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
index 9e7febedbae..16e8f6c9402 100644
--- a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/ColonBeforeReturnTypeIsPartOfTrivia.fs", false,
+     ("/root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs", false,
       QualifiedNameOfFile ColonBeforeReturnTypeIsPartOfTrivia, [], [],
       [SynModuleOrNamespace
          ([ColonBeforeReturnTypeIsPartOfTrivia], false, AnonModule,
@@ -19,39 +19,40 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (y, None), false, None,
-                           /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,6--2,7))],
+                           /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,6--2,7))],
                      None,
-                     /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,4--2,7)),
+                     /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,4--2,7)),
                   Some
                     (SynBindingReturnInfo
                        (LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,10--2,13),
+                        /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,10--2,13),
                         [],
                         { ColonRange =
                            Some
-                             /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,8--2,9) })),
+                             /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,8--2,9) })),
                   Typed
                     (App
                        (NonAtomic, false, Ident failwith,
                         Const
                           (String
                              ("todo", Regular,
-                              /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,25--2,31)),
-                           /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,25--2,31)),
-                        /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,16--2,31)),
+                              /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,25--2,31)),
+                           /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,25--2,31)),
+                        /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,16--2,31)),
                      LongIdent (SynLongIdent ([int], [], [None])),
-                     /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,16--2,31)),
-                  /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,4--2,7),
+                     /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,16--2,31)),
+                  /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,4--2,7),
                   NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,0--2,3)
+                     Let
+                       /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,14--2,15) })],
-              /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,0--2,31))],
+                       /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,14--2,15) })],
+              /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,0--2,31))],
           PreXmlDocEmpty, [], None,
-          /root/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,0--3,0),
+          /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs
rename to tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs
diff --git a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
similarity index 59%
rename from tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
index 30a9dabd57e..d7082cab820 100644
--- a/tests/service/data/SyntaxTree/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs", false,
+     ("/root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs", false,
       QualifiedNameOfFile ColonBeforeReturnTypeIsPartOfTriviaInProperties, [],
       [],
       [SynModuleOrNamespace
@@ -11,7 +11,7 @@ ImplFile
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,5--2,6)),
+                     /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [GetSetMember
@@ -34,40 +34,40 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; Y],
-                                     [/root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,15--3,16)],
+                                     [/root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,15--3,16)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,26--3,28)),
-                                        /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,26--3,28))],
+                                           /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,26--3,28)),
+                                        /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,26--3,28))],
                                   None,
-                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,23--3,28)),
+                                  /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,23--3,28)),
                                Some
                                  (SynBindingReturnInfo
                                     (LongIdent
                                        (SynLongIdent ([int], [], [None])),
-                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,29--3,32),
+                                     /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,29--3,32),
                                      [],
                                      { ColonRange =
                                         Some
-                                          /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,28--3,29) })),
+                                          /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,28--3,29) })),
                                Typed
                                  (Const
                                     (Int32 1,
-                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,35--3,36)),
+                                     /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,35--3,36)),
                                   LongIdent (SynLongIdent ([int], [], [None])),
-                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,35--3,36)),
-                               /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,23--3,28),
+                                  /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,35--3,36)),
+                               /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,23--3,28),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,4--3,10)
+                                    /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,4--3,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,33--3,34) })),
+                                    /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,33--3,34) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false, [],
@@ -88,69 +88,69 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; Y],
-                                     [/root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,15--3,16)],
+                                     [/root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,15--3,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Typed
                                           (Wild
-                                             /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,46--3,47),
+                                             /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,46--3,47),
                                            LongIdent
                                              (SynLongIdent ([int], [], [None])),
-                                           /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,46--3,51)),
-                                        /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,45--3,52))],
+                                           /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,46--3,51)),
+                                        /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,45--3,52))],
                                   None,
-                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,41--3,52)),
+                                  /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,41--3,52)),
                                Some
                                  (SynBindingReturnInfo
                                     (LongIdent
                                        (SynLongIdent ([unit], [], [None])),
-                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,53--3,57),
+                                     /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,53--3,57),
                                      [],
                                      { ColonRange =
                                         Some
-                                          /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,52--3,53) })),
+                                          /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,52--3,53) })),
                                Typed
                                  (Const
                                     (Unit,
-                                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,60--3,62)),
+                                     /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,60--3,62)),
                                   LongIdent (SynLongIdent ([unit], [], [None])),
-                                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,60--3,62)),
-                               /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,41--3,52),
+                                  /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,60--3,62)),
+                               /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,41--3,52),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,4--3,10)
+                                    /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,4--3,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,58--3,59) })),
-                         /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,4--3,62),
+                                    /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,58--3,59) })),
+                         /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,4--3,62),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,18--3,22)
+                            /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,18--3,22)
                            GetKeyword =
                             Some
-                              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,23--3,26)
+                              /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,23--3,26)
                            AndKeyword =
                             Some
-                              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,37--3,40)
+                              /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,37--3,40)
                            SetKeyword =
                             Some
-                              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,41--3,44) })],
-                     /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,4--3,62)),
+                              /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,41--3,44) })],
+                     /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (3,4--3,62)),
                   [], None,
-                  /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,5--3,62),
+                  /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,5--3,62),
                   { LeadingKeyword =
                      Type
-                       /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,0--2,4)
+                       /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,7--2,8)
+                       /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,0--3,62))],
+              /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,0--3,62))],
           PreXmlDocEmpty, [], None,
-          /root/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,0--4,0),
+          /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs b/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs
rename to tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs
diff --git a/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl
similarity index 51%
rename from tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl
index 0f8352899a8..21e23eab7b7 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirectiveAroundInlineKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/ConditionalDirectiveAroundInlineKeyword.fs", false,
+     ("/root/Binding/ConditionalDirectiveAroundInlineKeyword.fs", false,
       QualifiedNameOfFile ConditionalDirectiveAroundInlineKeyword, [], [],
       [SynModuleOrNamespace
          ([ConditionalDirectiveAroundInlineKeyword], false, AnonModule,
@@ -20,12 +20,12 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (f, None), false, None,
-                           /root/ConditionalDirectiveAroundInlineKeyword.fs (6,8--6,9));
+                           /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,8--6,9));
                         Named
                           (SynIdent (ar, None), false, None,
-                           /root/ConditionalDirectiveAroundInlineKeyword.fs (6,10--6,12))],
+                           /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,10--6,12))],
                      None,
-                     /root/ConditionalDirectiveAroundInlineKeyword.fs (6,4--6,12)),
+                     /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,4--6,12)),
                   None,
                   App
                     (NonAtomic, false,
@@ -35,9 +35,9 @@ ImplFile
                           (false,
                            SynLongIdent
                              ([Async; map],
-                              [/root/ConditionalDirectiveAroundInlineKeyword.fs (6,20--6,21)],
+                              [/root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,20--6,21)],
                               [None; None]), None,
-                           /root/ConditionalDirectiveAroundInlineKeyword.fs (6,15--6,24)),
+                           /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,15--6,24)),
                         Paren
                           (App
                              (NonAtomic, false,
@@ -45,36 +45,37 @@ ImplFile
                                 (false,
                                  SynLongIdent
                                    ([Result; map],
-                                    [/root/ConditionalDirectiveAroundInlineKeyword.fs (6,32--6,33)],
+                                    [/root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,32--6,33)],
                                     [None; None]), None,
-                                 /root/ConditionalDirectiveAroundInlineKeyword.fs (6,26--6,36)),
+                                 /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,26--6,36)),
                               Ident f,
-                              /root/ConditionalDirectiveAroundInlineKeyword.fs (6,26--6,38)),
-                           /root/ConditionalDirectiveAroundInlineKeyword.fs (6,25--6,26),
+                              /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,26--6,38)),
+                           /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,25--6,26),
                            Some
-                             /root/ConditionalDirectiveAroundInlineKeyword.fs (6,38--6,39),
-                           /root/ConditionalDirectiveAroundInlineKeyword.fs (6,25--6,39)),
-                        /root/ConditionalDirectiveAroundInlineKeyword.fs (6,15--6,39)),
+                             /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,38--6,39),
+                           /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,25--6,39)),
+                        /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,15--6,39)),
                      Ident ar,
-                     /root/ConditionalDirectiveAroundInlineKeyword.fs (6,15--6,42)),
-                  /root/ConditionalDirectiveAroundInlineKeyword.fs (6,4--6,12),
+                     /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,15--6,42)),
+                  /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,4--6,12),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/ConditionalDirectiveAroundInlineKeyword.fs (2,0--2,3)
+                       /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (2,0--2,3)
                     InlineKeyword =
                      Some
-                       /root/ConditionalDirectiveAroundInlineKeyword.fs (4,4--4,10)
+                       /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (4,4--4,10)
                     EqualsRange =
                      Some
-                       /root/ConditionalDirectiveAroundInlineKeyword.fs (6,13--6,14) })],
-              /root/ConditionalDirectiveAroundInlineKeyword.fs (2,0--6,42))],
+                       /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (6,13--6,14) })],
+              /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (2,0--6,42))],
           PreXmlDocEmpty, [], None,
-          /root/ConditionalDirectiveAroundInlineKeyword.fs (2,0--7,0),
+          /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives =
          [If
             (Not (Ident "FOO"),
-             /root/ConditionalDirectiveAroundInlineKeyword.fs (3,0--3,8));
-          EndIf /root/ConditionalDirectiveAroundInlineKeyword.fs (5,0--5,6)]
+             /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (3,0--3,8));
+          EndIf
+            /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (5,0--5,6)]
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/InlineKeywordInBinding.fs
rename to tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs
diff --git a/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/InlineKeywordInBinding.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl
index f92d8973960..02b3c0a6638 100644
--- a/tests/service/data/SyntaxTree/InlineKeywordInBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/InlineKeywordInBinding.fs", false,
+     ("/root/Binding/InlineKeywordInBinding.fs", false,
       QualifiedNameOfFile InlineKeywordInBinding, [], [],
       [SynModuleOrNamespace
          ([InlineKeywordInBinding], false, AnonModule,
@@ -20,11 +20,12 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (y, None), false, None,
-                           /root/InlineKeywordInBinding.fs (2,13--2,14));
+                           /root/Binding/InlineKeywordInBinding.fs (2,13--2,14));
                         Named
                           (SynIdent (z, None), false, None,
-                           /root/InlineKeywordInBinding.fs (2,15--2,16))], None,
-                     /root/InlineKeywordInBinding.fs (2,11--2,16)), None,
+                           /root/Binding/InlineKeywordInBinding.fs (2,15--2,16))],
+                     None, /root/Binding/InlineKeywordInBinding.fs (2,11--2,16)),
+                  None,
                   LetOrUse
                     (false, false,
                      [SynBinding
@@ -41,33 +42,42 @@ ImplFile
                             Pats
                               [Named
                                  (SynIdent (b, None), false, None,
-                                  /root/InlineKeywordInBinding.fs (3,17--3,18));
+                                  /root/Binding/InlineKeywordInBinding.fs (3,17--3,18));
                                Named
                                  (SynIdent (c, None), false, None,
-                                  /root/InlineKeywordInBinding.fs (3,19--3,20))],
-                            None, /root/InlineKeywordInBinding.fs (3,15--3,20)),
+                                  /root/Binding/InlineKeywordInBinding.fs (3,19--3,20))],
+                            None,
+                            /root/Binding/InlineKeywordInBinding.fs (3,15--3,20)),
                          None,
                          Const
-                           (Unit, /root/InlineKeywordInBinding.fs (3,23--3,25)),
-                         /root/InlineKeywordInBinding.fs (3,15--3,20), NoneAtLet,
+                           (Unit,
+                            /root/Binding/InlineKeywordInBinding.fs (3,23--3,25)),
+                         /root/Binding/InlineKeywordInBinding.fs (3,15--3,20),
+                         NoneAtLet,
                          { LeadingKeyword =
-                            Let /root/InlineKeywordInBinding.fs (3,4--3,7)
+                            Let
+                              /root/Binding/InlineKeywordInBinding.fs (3,4--3,7)
                            InlineKeyword =
-                            Some /root/InlineKeywordInBinding.fs (3,8--3,14)
+                            Some
+                              /root/Binding/InlineKeywordInBinding.fs (3,8--3,14)
                            EqualsRange =
-                            Some /root/InlineKeywordInBinding.fs (3,21--3,22) })],
-                     Const (Unit, /root/InlineKeywordInBinding.fs (4,4--4,6)),
-                     /root/InlineKeywordInBinding.fs (3,4--4,6),
+                            Some
+                              /root/Binding/InlineKeywordInBinding.fs (3,21--3,22) })],
+                     Const
+                       (Unit, /root/Binding/InlineKeywordInBinding.fs (4,4--4,6)),
+                     /root/Binding/InlineKeywordInBinding.fs (3,4--4,6),
                      { InKeyword = None }),
-                  /root/InlineKeywordInBinding.fs (2,11--2,16), NoneAtLet,
+                  /root/Binding/InlineKeywordInBinding.fs (2,11--2,16),
+                  NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/InlineKeywordInBinding.fs (2,0--2,3)
+                     Let /root/Binding/InlineKeywordInBinding.fs (2,0--2,3)
                     InlineKeyword =
-                     Some /root/InlineKeywordInBinding.fs (2,4--2,10)
+                     Some /root/Binding/InlineKeywordInBinding.fs (2,4--2,10)
                     EqualsRange =
-                     Some /root/InlineKeywordInBinding.fs (2,17--2,18) })],
-              /root/InlineKeywordInBinding.fs (2,0--4,6))], PreXmlDocEmpty, [],
-          None, /root/InlineKeywordInBinding.fs (2,0--5,0),
+                     Some /root/Binding/InlineKeywordInBinding.fs (2,17--2,18) })],
+              /root/Binding/InlineKeywordInBinding.fs (2,0--4,6))],
+          PreXmlDocEmpty, [], None,
+          /root/Binding/InlineKeywordInBinding.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
new file mode 100644
index 00000000000..6f097852bcd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
@@ -0,0 +1,59 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet],
+          false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false,
+                  [{ Attributes =
+                      [{ TypeName = SynLongIdent ([Literal], [], [None])
+                         ArgExpr =
+                          Const
+                            (Unit,
+                             /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,6--2,13))
+                         Target = None
+                         AppliesToGetterAndSetter = false
+                         Range =
+                          /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,6--2,13) }]
+                     Range =
+                      /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,4--2,15) }],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Paren
+                    (LongIdent
+                       (SynLongIdent ([A], [], [None]), None, None,
+                        Pats
+                          [Named
+                             (SynIdent (x, None), false, None,
+                              /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,19--2,20))],
+                        None,
+                        /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,17--2,20)),
+                     /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,16--2,21)),
+                  None,
+                  Const
+                    (Int32 1,
+                     /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,24--2,25)),
+                  /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,4--2,21),
+                  Yes
+                    /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,25),
+                  { LeadingKeyword =
+                     Let
+                       /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,22--2,23) })],
+              /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,25))],
+          PreXmlDocEmpty, [], None,
+          /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
index 6659da43598..168e49152b0 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs",
+     ("/root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs",
       false,
       QualifiedNameOfFile
         RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr, [], [],
@@ -12,15 +12,15 @@ ImplFile
                 (LongIdent
                    (SynLongIdent
                       ([System; Object],
-                       [/root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,12--2,13)],
+                       [/root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,12--2,13)],
                        [None; None])),
                  Some
                    (Const
                       (Unit,
-                       /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,19--2,21)),
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,19--2,21)),
                     None),
                  Some
-                   /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,22--2,26),
+                   /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,22--2,26),
                  [],
                  [Member
                     (SynBinding
@@ -30,13 +30,13 @@ ImplFile
                                ArgExpr =
                                 Const
                                   (Unit,
-                                   /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,6--3,9))
+                                   /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,6--3,9))
                                Target = None
                                AppliesToGetterAndSetter = false
                                Range =
-                                /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,6--3,9) }]
+                                /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,6--3,9) }]
                            Range =
-                            /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,4--3,11) }],
+                            /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,4--3,11) }],
                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (Some { IsInstance = true
@@ -51,38 +51,38 @@ ImplFile
                         LongIdent
                           (SynLongIdent
                              ([x; ToString],
-                              [/root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,12--4,13)],
+                              [/root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,12--4,13)],
                               [None; None]), None, None,
                            Pats
                              [Paren
                                 (Const
                                    (Unit,
-                                    /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,21--4,23)),
-                                 /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,21--4,23))],
+                                    /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,21--4,23)),
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,21--4,23))],
                            None,
-                           /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,11--4,23)),
+                           /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,11--4,23)),
                         None,
                         Const
                           (String
                              ("F#", Regular,
-                              /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,26--4,30)),
-                           /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,26--4,30)),
-                        /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,4--4,23),
+                              /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,26--4,30)),
+                           /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,26--4,30)),
+                        /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,4--4,23),
                         NoneAtInvisible,
                         { LeadingKeyword =
                            Member
-                             /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,4--4,10)
+                             /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,4--4,10)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,24--4,25) }),
-                     /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,4--4,30))],
+                             /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (4,24--4,25) }),
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (3,4--4,30))],
                  [],
-                 /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,2--2,21),
-                 /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,0--4,32)),
-              /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,0--4,32))],
+                 /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,2--2,21),
+                 /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,0--4,32)),
+              /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,0--4,32))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,0--4,32),
+          /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,0--4,32),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
similarity index 55%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
index 8dd7cc53f03..38a0279094b 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs",
+     ("/root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs",
       false,
       QualifiedNameOfFile
         RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember, [], [],
@@ -13,7 +13,7 @@ ImplFile
                     ([], None, [], [Tiger],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,5--2,10)),
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,5--2,10)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -24,13 +24,13 @@ ImplFile
                                    ArgExpr =
                                     Const
                                       (Unit,
-                                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,6--3,9))
+                                       /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,6--3,9))
                                    Target = None
                                    AppliesToGetterAndSetter = false
                                    Range =
-                                    /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,6--3,9) }]
+                                    /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,6--3,9) }]
                                Range =
-                                /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--3,11) }],
+                                /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--3,11) }],
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = false
@@ -48,37 +48,37 @@ ImplFile
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,8--4,10)),
-                                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,8--4,10))],
+                                        /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,8--4,10)),
+                                     /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,8--4,10))],
                                None,
-                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,4--4,7)),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,4--4,7)),
                             None,
                             Const
                               (Unit,
-                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,13--4,15)),
-                            /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--4,10),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,13--4,15)),
+                            /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--4,10),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                New
-                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,4--4,7)
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,4--4,7)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,11--4,12) }),
-                         /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--4,15))],
-                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--4,15)),
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (4,11--4,12) }),
+                         /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--4,15))],
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (3,4--4,15)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,5--4,15),
+                  /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,5--4,15),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,0--2,4)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,11--2,12)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,0--4,15))],
+              /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,0--4,15))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,0--5,0),
+          /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl
index 4dae7c02a4e..abe8ef8a683 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl
@@ -1,12 +1,12 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs",
+     ("/root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs",
       false,
       QualifiedNameOfFile
-        RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec,
+        RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec,
       [], [],
       [SynModuleOrNamespace
-         ([RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec],
+         ([RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec],
           false, AnonModule,
           [Types
              ([SynTypeDefn
@@ -14,7 +14,7 @@ ImplFile
                     ([], None, [], [Tiger],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,5--2,10)),
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (2,5--2,10)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -25,13 +25,13 @@ ImplFile
                                    ArgExpr =
                                     Const
                                       (Unit,
-                                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,6--3,9))
+                                       /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (3,6--3,9))
                                    Target = None
                                    AppliesToGetterAndSetter = false
                                    Range =
-                                    /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,6--3,9) }]
+                                    /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (3,6--3,9) }]
                                Range =
-                                /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,4--3,11) }],
+                                /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (3,4--3,11) }],
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = false
@@ -49,37 +49,37 @@ ImplFile
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (4,8--4,10)),
-                                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (4,8--4,10))],
+                                        /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (4,8--4,10)),
+                                     /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (4,8--4,10))],
                                None,
-                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (4,4--4,7)),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (4,4--4,7)),
                             None,
                             Const
                               (Unit,
-                               /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (4,21--4,23)),
-                            /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,4--4,18),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (4,21--4,23)),
+                            /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (3,4--4,18),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                New
-                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (4,4--4,7)
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (4,4--4,7)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (4,19--4,20) }),
-                         /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,4--4,23))],
-                     /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (3,4--4,23)),
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (4,19--4,20) }),
+                         /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (3,4--4,23))],
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (3,4--4,23)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,5--4,23),
+                  /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (2,5--4,23),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,0--2,4)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,11--2,12)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,0--4,23))],
+              /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (2,0--4,23))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember,OptAsSpec.fs (2,0--5,0),
+          /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
similarity index 57%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
index 84e30805cd4..5eee29b9c02 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs",
+     ("/root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs",
       false,
       QualifiedNameOfFile
         RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty, [],
@@ -14,7 +14,7 @@ ImplFile
                     ([], None, [], [Bird],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,5--2,9)),
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,5--2,9)),
                   ObjectModel
                     (Unspecified,
                      [GetSetMember
@@ -27,13 +27,13 @@ ImplFile
                                       ArgExpr =
                                        Const
                                          (Unit,
-                                          /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,6--3,9))
+                                          /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,6--3,9))
                                       Target = None
                                       AppliesToGetterAndSetter = false
                                       Range =
-                                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,6--3,9) }]
+                                       /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,6--3,9) }]
                                   Range =
-                                   /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--3,11) }],
+                                   /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--3,11) }],
                                PreXmlMerge
   (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
@@ -50,26 +50,26 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; TheWord],
-                                     [/root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,15--4,16)],
+                                     [/root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,15--4,16)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,17--5,19)),
-                                        /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,17--5,19))],
+                                           /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,17--5,19)),
+                                        /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,17--5,19))],
                                   None,
-                                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,13--5,19)),
+                                  /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,13--5,19)),
                                None, Ident myInternalValue,
-                               /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--5,19),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--5,19),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,4--4,10)
+                                    /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,20--5,21) })),
+                                    /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,20--5,21) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false,
@@ -79,13 +79,13 @@ ImplFile
                                       ArgExpr =
                                        Const
                                          (Unit,
-                                          /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,6--3,9))
+                                          /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,6--3,9))
                                       Target = None
                                       AppliesToGetterAndSetter = false
                                       Range =
-                                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,6--3,9) }]
+                                       /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,6--3,9) }]
                                   Range =
-                                   /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--3,11) }],
+                                   /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--3,11) }],
                                PreXmlMerge
   (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
@@ -103,56 +103,56 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; TheWord],
-                                     [/root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,15--4,16)],
+                                     [/root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,15--4,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Named
                                           (SynIdent (value, None), false, None,
-                                           /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,17--6,22)),
-                                        /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,16--6,23))],
+                                           /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,17--6,22)),
+                                        /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,16--6,23))],
                                   None,
-                                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,12--6,23)),
+                                  /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,12--6,23)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([myInternalValue], [], [None]),
                                   Ident value,
-                                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,26--6,50)),
-                               /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--6,23),
+                                  /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,26--6,50)),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--6,23),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,4--4,10)
+                                    /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,24--6,25) })),
-                         /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--6,50),
+                                    /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,24--6,25) })),
+                         /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--6,50),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,8--5,12)
+                            /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,8--5,12)
                            GetKeyword =
                             Some
-                              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,13--5,16)
+                              /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (5,13--5,16)
                            AndKeyword =
                             Some
-                              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,8--6,11)
+                              /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,8--6,11)
                            SetKeyword =
                             Some
-                              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,12--6,15) })],
-                     /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--6,50)),
+                              /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (6,12--6,15) })],
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (3,4--6,50)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,5--6,50),
+                  /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,5--6,50),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,0--2,4)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,10--2,11)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,10--2,11)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,0--6,50))],
+              /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,0--6,50))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,0--7,0),
+          /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
similarity index 57%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
index 786b61bca3a..10ac678b3a4 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs", false,
+     ("/root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs",
+      false,
       QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSecondaryConstructor,
       [], [],
       [SynModuleOrNamespace
@@ -12,17 +13,17 @@ ImplFile
                     ([], None, [], [T],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,5--2,6)),
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,6--2,8)),
+                            /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,6--2,8)),
                          None,
                          PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,5--2,6),
+                         /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,5--2,6),
                          { AsKeyword = None });
                       Member
                         (SynBinding
@@ -44,27 +45,27 @@ ImplFile
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,8--3,10)),
-                                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,8--3,10))],
+                                        /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,8--3,10)),
+                                     /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,8--3,10))],
                                None,
-                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--3,7)),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--3,7)),
                             None,
                             App
                               (NonAtomic, false, Ident T,
                                Const
                                  (Unit,
-                                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (4,10--4,12)),
-                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (4,8--4,12)),
-                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--3,10),
+                                  /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (4,10--4,12)),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (4,8--4,12)),
+                            /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--3,10),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                New
-                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--3,7)
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--3,7)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,11--3,12) }),
-                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--4,12));
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,11--3,12) }),
+                         /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--4,12));
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
@@ -85,29 +86,29 @@ ImplFile
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,17--6,19)),
-                                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,17--6,19))],
+                                        /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,17--6,19)),
+                                     /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,17--6,19))],
                                Some
                                  (Internal
-                                    /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,4--6,12)),
-                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,13--6,16)),
+                                    /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,4--6,12)),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,13--6,16)),
                             None,
                             App
                               (NonAtomic, false, Ident T,
                                Const
                                  (Unit,
-                                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (7,10--7,12)),
-                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (7,8--7,12)),
-                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,4--6,19),
+                                  /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (7,10--7,12)),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (7,8--7,12)),
+                            /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,4--6,19),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                New
-                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,13--6,16)
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,13--6,16)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,20--6,21) }),
-                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,4--7,12));
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,20--6,21) }),
+                         /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (6,4--7,12));
                       Member
                         (SynBinding
                            (None, Normal, false, false,
@@ -116,13 +117,13 @@ ImplFile
                                    ArgExpr =
                                     Const
                                       (Unit,
-                                       /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,6--9,9))
+                                       /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,6--9,9))
                                    Target = None
                                    AppliesToGetterAndSetter = false
                                    Range =
-                                    /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,6--9,9) }]
+                                    /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,6--9,9) }]
                                Range =
-                                /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,4--9,11) }],
+                                /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,4--9,11) }],
                             PreXmlDoc ((9,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = false
@@ -140,50 +141,50 @@ ImplFile
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,8--10,10)),
-                                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,8--10,10))],
+                                        /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,8--10,10)),
+                                     /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,8--10,10))],
                                None,
-                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,4--10,7)),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,4--10,7)),
                             None,
                             App
                               (NonAtomic, false, Ident T,
                                Const
                                  (Unit,
-                                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (11,10--11,12)),
-                               /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (11,8--11,12)),
-                            /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,4--10,10),
+                                  /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (11,10--11,12)),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (11,8--11,12)),
+                            /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,4--10,10),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                New
-                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,4--10,7)
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,4--10,7)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,11--10,12) }),
-                         /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,4--11,12))],
-                     /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--11,12)),
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (10,11--10,12) }),
+                         /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (9,4--11,12))],
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (3,4--11,12)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,6--2,8)),
+                           /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,6--2,8)),
                         None,
                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,5--2,6),
+                        /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,5--11,12),
+                  /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,5--11,12),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,0--2,4)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,9--2,10)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,0--11,12))],
+              /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,0--11,12))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,0--12,0),
+          /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,0--12,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
index b9319d007bb..9ee10344c01 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs",
+     ("/root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs",
       false,
       QualifiedNameOfFile
         RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings, [], [],
@@ -13,7 +13,7 @@ ImplFile
                     ([], None, [], [Bar],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,5--2,8)),
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [LetBindings
@@ -24,13 +24,13 @@ ImplFile
                                     ArgExpr =
                                      Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,6--3,9))
+                                        /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,6--3,9))
                                     Target = None
                                     AppliesToGetterAndSetter = false
                                     Range =
-                                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,6--3,9) }]
+                                     /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,6--3,9) }]
                                 Range =
-                                 /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--3,11) }],
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--3,11) }],
                              PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                              SynValData
                                (None,
@@ -38,36 +38,36 @@ ImplFile
                                 None),
                              Named
                                (SynIdent (x, None), false, None,
-                                /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (4,8--4,9)),
+                                /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (4,8--4,9)),
                              None,
                              Const
                                (Int32 8,
-                                /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (4,12--4,13)),
-                             /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--4,9),
+                                /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (4,12--4,13)),
+                             /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--4,9),
                              Yes
-                               /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--4,13),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--4,13),
                              { LeadingKeyword =
                                 Let
-                                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (4,4--4,7)
+                                  /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (4,4--4,7)
                                InlineKeyword = None
                                EqualsRange =
                                 Some
-                                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (4,10--4,11) })],
+                                  /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (4,10--4,11) })],
                          false, false,
-                         /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--4,13))],
-                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--4,13)),
+                         /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--4,13))],
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (3,4--4,13)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,5--4,13),
+                  /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,5--4,13),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,0--2,4)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,9--2,10)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,0--4,13))],
+              /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,0--4,13))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,0--5,0),
+          /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
similarity index 56%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
index 441f359e279..0ca71236280 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs", false,
+     ("/root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs",
+      false,
       QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynMemberDefnMember,
       [], [],
       [SynModuleOrNamespace
@@ -12,7 +13,7 @@ ImplFile
                     ([], None, [], [Bar],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,5--2,8)),
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -23,13 +24,13 @@ ImplFile
                                    ArgExpr =
                                     Const
                                       (Unit,
-                                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,6--3,9))
+                                       /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,6--3,9))
                                    Target = None
                                    AppliesToGetterAndSetter = false
                                    Range =
-                                    /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,6--3,9) }]
+                                    /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,6--3,9) }]
                                Range =
-                                /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--3,11) }],
+                                /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--3,11) }],
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             SynValData
                               (Some { IsInstance = true
@@ -44,43 +45,43 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; Something],
-                                  [/root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,15--4,16)],
+                                  [/root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,15--4,16)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,26--4,28)),
-                                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,26--4,28))],
+                                        /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,26--4,28)),
+                                     /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,26--4,28))],
                                None,
-                               /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,11--4,28)),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,11--4,28)),
                             None,
                             Const
                               (Unit,
-                               /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,31--4,33)),
-                            /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--4,28),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,31--4,33)),
+                            /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--4,28),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,4--4,10)
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,4--4,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,29--4,30) }),
-                         /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--4,33))],
-                     /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--4,33)),
+                                 /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (4,29--4,30) }),
+                         /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--4,33))],
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (3,4--4,33)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,5--4,33),
+                  /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,5--4,33),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,0--2,4)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,9--2,10)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,0--4,33))],
+              /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,0--4,33))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,0--5,0),
+          /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
index 9299162a68f..5b7cb00c2d1 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs", false,
+     ("/root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs",
+      false,
       QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynModuleDeclLet, [],
       [],
       [SynModuleOrNamespace
@@ -15,36 +16,36 @@ ImplFile
                          ArgExpr =
                           Const
                             (Unit,
-                             /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,2--2,5))
+                             /root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,2--2,5))
                          Target = None
                          AppliesToGetterAndSetter = false
                          Range =
-                          /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,2--2,5) }]
+                          /root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,2--2,5) }]
                      Range =
-                      /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,7) }],
+                      /root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,7) }],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (a, None), false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (3,4--3,5)),
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (3,4--3,5)),
                   None,
                   Const
                     (Int32 0,
-                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (3,8--3,9)),
-                  /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--3,5),
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (3,8--3,9)),
+                  /root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--3,5),
                   Yes
-                    /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--3,9),
+                    /root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--3,9),
                   { LeadingKeyword =
                      Let
-                       /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (3,0--3,3)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (3,0--3,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (3,6--3,7) })],
-              /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--3,9))],
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (3,6--3,7) })],
+              /root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--3,9))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--4,0),
+          /root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
similarity index 56%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
index eac4f828c51..0d5d5fd4b64 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs",
+     ("/root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs",
       false,
       QualifiedNameOfFile
         RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty,
@@ -14,7 +14,7 @@ ImplFile
                     ([], None, [], [Crane],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,5--2,10)),
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,5--2,10)),
                   ObjectModel
                     (Unspecified,
                      [GetSetMember
@@ -28,13 +28,13 @@ ImplFile
                                       ArgExpr =
                                        Const
                                          (Unit,
-                                          /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,6--3,9))
+                                          /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,6--3,9))
                                       Target = None
                                       AppliesToGetterAndSetter = false
                                       Range =
-                                       /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,6--3,9) }]
+                                       /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,6--3,9) }]
                                   Range =
-                                   /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--3,11) }],
+                                   /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--3,11) }],
                                PreXmlMerge
   (PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector), PreXmlDocEmpty),
                                SynValData
@@ -52,52 +52,52 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyWriteOnlyProperty],
-                                     [/root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,15--4,16)],
+                                     [/root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,15--4,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Named
                                           (SynIdent (value, None), false, None,
-                                           /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,46--4,51)),
-                                        /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,45--4,52))],
+                                           /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,46--4,51)),
+                                        /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,45--4,52))],
                                   None,
-                                  /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,41--4,52)),
+                                  /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,41--4,52)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([myInternalValue], [], [None]),
                                   Ident value,
-                                  /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,55--4,79)),
-                               /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--4,52),
+                                  /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,55--4,79)),
+                               /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--4,52),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,4--4,10)
+                                    /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,53--4,54) })),
-                         /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--4,79),
+                                    /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,53--4,54) })),
+                         /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--4,79),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,36--4,40)
+                            /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,36--4,40)
                            GetKeyword = None
                            AndKeyword = None
                            SetKeyword =
                             Some
-                              /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,41--4,44) })],
-                     /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--4,79)),
+                              /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (4,41--4,44) })],
+                     /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (3,4--4,79)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,5--4,79),
+                  /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,5--4,79),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,0--2,4)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,11--2,12)
+                       /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,0--4,79))],
+              /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,0--4,79))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,0--5,0),
+          /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
index cad92a0ca80..85b532c7686 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs", false,
+     ("/root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs", false,
       QualifiedNameOfFile RangeOfEqualSignShouldBePresentInLocalLetBinding, [],
       [],
       [SynModuleOrNamespace
@@ -17,30 +17,30 @@ ImplFile
                            None),
                         Named
                           (SynIdent (z, None), false, None,
-                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,8--3,9)),
+                           /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,8--3,9)),
                         None,
                         Const
                           (Int32 2,
-                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,12--3,13)),
-                        /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,8--3,9),
+                           /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,12--3,13)),
+                        /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,8--3,9),
                         Yes
-                          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,4--3,13),
+                          /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,4--3,13),
                         { LeadingKeyword =
                            Let
-                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,4--3,7)
+                             /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,4--3,7)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,10--3,11) })],
+                             /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,10--3,11) })],
                     Const
                       (Unit,
-                       /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (4,4--4,6)),
-                    /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,4--4,6),
+                       /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (4,4--4,6)),
+                    /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (3,4--4,6),
                     { InKeyword = None }),
-                 /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,0--4,6)),
-              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,0--4,6))],
+                 /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,0--4,6)),
+              /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,0--4,6))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,0--5,0),
+          /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl
new file mode 100644
index 00000000000..dd08bad7bf9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl
@@ -0,0 +1,58 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs",
+      false,
+      QualifiedNameOfFile RangeOfEqualSignShouldBePresentInLocalLetBindingTyped,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfEqualSignShouldBePresentInLocalLetBindingTyped], false,
+          AnonModule,
+          [Expr
+             (Do
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (z, None), false, None,
+                           /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (3,8--3,9)),
+                        Some
+                          (SynBindingReturnInfo
+                             (LongIdent (SynLongIdent ([int], [], [None])),
+                              /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (3,11--3,14),
+                              [],
+                              { ColonRange =
+                                 Some
+                                   /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (3,9--3,10) })),
+                        Typed
+                          (Const
+                             (Int32 2,
+                              /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (3,17--3,18)),
+                           LongIdent (SynLongIdent ([int], [], [None])),
+                           /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (3,17--3,18)),
+                        /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (3,8--3,9),
+                        Yes
+                          /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (3,4--3,18),
+                        { LeadingKeyword =
+                           Let
+                             /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (3,4--3,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (3,15--3,16) })],
+                    Const
+                      (Unit,
+                       /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (4,4--4,6)),
+                    /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (3,4--4,6),
+                    { InKeyword = None }),
+                 /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (2,0--4,6)),
+              /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (2,0--4,6))],
+          PreXmlDocEmpty, [], None,
+          /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (2,0--5,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
similarity index 60%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
index ef122d7f88e..18932f5495e 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfEqualSignShouldBePresentInMemberBinding.fs", false,
+     ("/root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs", false,
       QualifiedNameOfFile RangeOfEqualSignShouldBePresentInMemberBinding, [], [],
       [SynModuleOrNamespace
          ([RangeOfEqualSignShouldBePresentInMemberBinding], false, AnonModule,
@@ -10,17 +10,17 @@ ImplFile
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,5--2,6)),
+                     /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,6--2,8)),
+                            /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,6--2,8)),
                          None,
                          PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,5--2,6),
+                         /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,5--2,6),
                          { AsKeyword = None });
                       Member
                         (SynBinding
@@ -39,43 +39,43 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; Y],
-                                  [/root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,15--3,16)],
+                                  [/root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,15--3,16)],
                                   [None; None]), None, None, Pats [], None,
-                               /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,11--3,17)),
+                               /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,11--3,17)),
                             None, Ident z,
-                            /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,11--3,17),
+                            /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,11--3,17),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,4--3,10)
+                                 /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,4--3,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,18--3,19) }),
-                         /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,4--3,21))],
-                     /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,4--3,21)),
+                                 /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,18--3,19) }),
+                         /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,4--3,21))],
+                     /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (3,4--3,21)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,6--2,8)),
+                           /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,6--2,8)),
                         None,
                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,5--2,6),
+                        /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,5--3,21),
+                  /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,5--3,21),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,0--2,4)
+                       /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,9--2,10)
+                       /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,0--3,21))],
+              /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,0--3,21))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,0--4,0),
+          /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl
index 5b0672aa10c..16cdba5225c 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl
@@ -1,11 +1,11 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs",
+     ("/root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs",
       false,
       QualifiedNameOfFile
-        RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters, [], [],
+        RangeOfEqualSignShouldBePresentInMemberBindingWithParameters, [], [],
       [SynModuleOrNamespace
-         ([RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters], false,
+         ([RangeOfEqualSignShouldBePresentInMemberBindingWithParameters], false,
           AnonModule,
           [Types
              ([SynTypeDefn
@@ -13,17 +13,17 @@ ImplFile
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,5--2,6)),
+                     /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,6--2,8)),
+                            /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (2,6--2,8)),
                          None,
                          PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,5--2,6),
+                         /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (2,5--2,6),
                          { AsKeyword = None });
                       Member
                         (SynBinding
@@ -42,50 +42,50 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; Y],
-                                  [/root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,15--3,16)],
+                                  [/root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (3,15--3,16)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,18--3,20)),
-                                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,18--3,20))],
+                                        /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (3,18--3,20)),
+                                     /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (3,18--3,20))],
                                None,
-                               /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,11--3,20)),
+                               /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (3,11--3,20)),
                             None, Ident z,
-                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,11--3,20),
+                            /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (3,11--3,20),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,4--3,10)
+                                 /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (3,4--3,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,21--3,22) }),
-                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,4--3,24))],
-                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (3,4--3,24)),
+                                 /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (3,21--3,22) }),
+                         /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (3,4--3,24))],
+                     /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (3,4--3,24)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,6--2,8)),
+                           /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (2,6--2,8)),
                         None,
                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,5--2,6),
+                        /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,5--3,24),
+                  /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (2,5--3,24),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,0--2,4)
+                       /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,9--2,10)
+                       /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,0--3,24))],
+              /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (2,0--3,24))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithParameters.fs (2,0--4,0),
+          /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl
index 6bd77e4926d..73c9d898932 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl
@@ -1,11 +1,11 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs",
+     ("/root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs",
       false,
       QualifiedNameOfFile
-        RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType, [], [],
+        RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType, [], [],
       [SynModuleOrNamespace
-         ([RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType], false,
+         ([RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType], false,
           AnonModule,
           [Types
              ([SynTypeDefn
@@ -13,17 +13,17 @@ ImplFile
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,5--2,6)),
+                     /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,6--2,8)),
+                            /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (2,6--2,8)),
                          None,
                          PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,5--2,6),
+                         /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (2,5--2,6),
                          { AsKeyword = None });
                       Member
                         (SynBinding
@@ -42,62 +42,62 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; Y],
-                                  [/root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,15--3,16)],
+                                  [/root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (3,15--3,16)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,18--3,20)),
-                                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,18--3,20))],
+                                        /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (3,18--3,20)),
+                                     /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (3,18--3,20))],
                                None,
-                               /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,11--3,20)),
+                               /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (3,11--3,20)),
                             Some
                               (SynBindingReturnInfo
                                  (LongIdent
                                     (SynLongIdent ([string], [], [None])),
-                                  /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,23--3,29),
+                                  /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (3,23--3,29),
                                   [],
                                   { ColonRange =
                                      Some
-                                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,21--3,22) })),
+                                       /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (3,21--3,22) })),
                             Typed
                               (Ident z,
                                LongIdent (SynLongIdent ([string], [], [None])),
-                               /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,32--3,33)),
-                            /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,11--3,20),
+                               /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (3,32--3,33)),
+                            /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (3,11--3,20),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,4--3,10)
+                                 /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (3,4--3,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,30--3,31) }),
-                         /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,4--3,33))],
-                     /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (3,4--3,33)),
+                                 /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (3,30--3,31) }),
+                         /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (3,4--3,33))],
+                     /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (3,4--3,33)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,6--2,8)),
+                           /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (2,6--2,8)),
                         None,
                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,5--2,6),
+                        /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,5--3,33),
+                  /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (2,5--3,33),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,0--2,4)
+                       /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,9--2,10)
+                       /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,0--3,33))],
+              /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (2,0--3,33))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInMemberBinding,WithReturnType.fs (2,0--4,0),
+          /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
similarity index 62%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
index a479e7696d4..5d5026f2b76 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfEqualSignShouldBePresentInProperty.fs", false,
+     ("/root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs", false,
       QualifiedNameOfFile RangeOfEqualSignShouldBePresentInProperty, [], [],
       [SynModuleOrNamespace
          ([RangeOfEqualSignShouldBePresentInProperty], false, AnonModule,
@@ -10,17 +10,17 @@ ImplFile
                     ([], None, [], [Y],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,5--2,6)),
+                     /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,6--2,8)),
+                            /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (2,6--2,8)),
                          None,
                          PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,5--2,6),
+                         /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (2,5--2,6),
                          { AsKeyword = None });
                       GetSetMember
                         (Some
@@ -42,26 +42,26 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadWriteProperty],
-                                     [/root/RangeOfEqualSignShouldBePresentInProperty.fs (3,15--3,16)],
+                                     [/root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (3,15--3,16)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,17--4,19)),
-                                        /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,17--4,19))],
+                                           /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (4,17--4,19)),
+                                        /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (4,17--4,19))],
                                   None,
-                                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,13--4,19)),
+                                  /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (4,13--4,19)),
                                None, Ident myInternalValue,
-                               /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,13--4,19),
+                               /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (4,13--4,19),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,4--3,10)
+                                    /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (3,4--3,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,20--4,21) })),
+                                    /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (4,20--4,21) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false, [],
@@ -82,66 +82,66 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadWriteProperty],
-                                     [/root/RangeOfEqualSignShouldBePresentInProperty.fs (3,15--3,16)],
+                                     [/root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (3,15--3,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Named
                                           (SynIdent (value, None), false, None,
-                                           /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,17--5,22)),
-                                        /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,16--5,23))],
+                                           /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (5,17--5,22)),
+                                        /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (5,16--5,23))],
                                   None,
-                                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,12--5,23)),
+                                  /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (5,12--5,23)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([myInternalValue], [], [None]),
                                   Ident value,
-                                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,26--5,50)),
-                               /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,12--5,23),
+                                  /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (5,26--5,50)),
+                               /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (5,12--5,23),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,4--3,10)
+                                    /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (3,4--3,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,24--5,25) })),
-                         /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,4--5,50),
+                                    /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (5,24--5,25) })),
+                         /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (3,4--5,50),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,8--4,12)
+                            /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (4,8--4,12)
                            GetKeyword =
                             Some
-                              /root/RangeOfEqualSignShouldBePresentInProperty.fs (4,13--4,16)
+                              /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (4,13--4,16)
                            AndKeyword =
                             Some
-                              /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,8--5,11)
+                              /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (5,8--5,11)
                            SetKeyword =
                             Some
-                              /root/RangeOfEqualSignShouldBePresentInProperty.fs (5,12--5,15) })],
-                     /root/RangeOfEqualSignShouldBePresentInProperty.fs (3,4--5,50)),
+                              /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (5,12--5,15) })],
+                     /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (3,4--5,50)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,6--2,8)),
+                           /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (2,6--2,8)),
                         None,
                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,5--2,6),
+                        /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,5--5,50),
+                  /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (2,5--5,50),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,0--2,4)
+                       /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,9--2,10)
+                       /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,0--5,50))],
+              /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (2,0--5,50))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInProperty.fs (2,0--6,0),
+          /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
index 38d18ddc144..55b7c493005 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs", false,
+     ("/root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs",
+      false,
       QualifiedNameOfFile
         RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding, [], [],
       [SynModuleOrNamespace
@@ -15,24 +16,24 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (v, None), false, None,
-                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,4--2,5)),
+                     /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,4--2,5)),
                   None,
                   Const
                     (Int32 12,
-                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,8--2,10)),
-                  /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,4--2,5),
+                     /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,8--2,10)),
+                  /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,4--2,5),
                   Yes
-                    /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,10),
+                    /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,10),
                   { LeadingKeyword =
                      Let
-                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,3)
+                       /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,6--2,7) })],
-              /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,10))],
+                       /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,6--2,7) })],
+              /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,10))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,0--3,0),
+          /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl
new file mode 100644
index 00000000000..d25f98d7be7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl
@@ -0,0 +1,49 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped], false,
+          AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs (2,4--2,5)),
+                  Some
+                    (SynBindingReturnInfo
+                       (LongIdent (SynLongIdent ([int], [], [None])),
+                        /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs (2,8--2,11),
+                        [],
+                        { ColonRange =
+                           Some
+                             /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs (2,6--2,7) })),
+                  Typed
+                    (Const
+                       (Int32 12,
+                        /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs (2,14--2,16)),
+                     LongIdent (SynLongIdent ([int], [], [None])),
+                     /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs (2,14--2,16)),
+                  /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs (2,4--2,5),
+                  Yes
+                    /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs (2,0--2,16),
+                  { LeadingKeyword =
+                     Let
+                       /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs (2,12--2,13) })],
+              /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs (2,0--2,16))],
+          PreXmlDocEmpty, [], None,
+          /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
similarity index 58%
rename from tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
index ef5b5feedf5..ee895f9e875 100644
--- a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs", false,
+     ("/root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs",
+      false,
       QualifiedNameOfFile
         RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding, [], [],
       [SynModuleOrNamespace
@@ -15,7 +16,7 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (a, None), false, None,
-                     /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,4--2,5)),
+                     /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,4--2,5)),
                   None,
                   LetOrUse
                     (false, false,
@@ -32,36 +33,36 @@ ImplFile
                             Pats
                               [Named
                                  (SynIdent (c, None), false, None,
-                                  /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,10--3,11))],
+                                  /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,10--3,11))],
                             None,
-                            /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,8--3,11)),
+                            /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,8--3,11)),
                          None, Ident d,
-                         /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,8--3,11),
+                         /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,8--3,11),
                          NoneAtLet,
                          { LeadingKeyword =
                             Let
-                              /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,4--3,7)
+                              /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,4--3,7)
                            InlineKeyword = None
                            EqualsRange =
                             Some
-                              /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,12--3,13) })],
+                              /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,12--3,13) })],
                      Const
                        (Unit,
-                        /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (4,4--4,6)),
-                     /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,4--4,6),
+                        /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (4,4--4,6)),
+                     /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (3,4--4,6),
                      { InKeyword = None }),
-                  /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,4--2,5),
+                  /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,4--2,5),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,0--2,3)
+                       /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,6--2,7) })],
-              /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,0--4,6))],
+                       /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,6--2,7) })],
+              /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,0--4,6))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,0--5,0),
+          /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
rename to tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
index 27bf7206361..00a22ca6a02 100644
--- a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs",
+     ("/root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs",
       false,
       QualifiedNameOfFile
         RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding, [], [],
@@ -16,24 +16,24 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (v, None), false, None,
-                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,4--2,5)),
+                     /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,4--2,5)),
                   None,
                   Const
                     (Int32 12,
-                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,8--2,10)),
-                  /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,4--2,5),
+                     /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,8--2,10)),
+                  /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,4--2,5),
                   Yes
-                    /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,10),
+                    /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,10),
                   { LeadingKeyword =
                      Let
-                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,3)
+                       /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,6--2,7) })],
-              /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,10))],
+                       /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,6--2,7) })],
+              /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,0--2,10))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,0--3,0),
+          /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs
rename to tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
new file mode 100644
index 00000000000..52122cf9455
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
@@ -0,0 +1,55 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs",
+      false,
+      QualifiedNameOfFile
+        RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes],
+          false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false,
+                  [{ Attributes =
+                      [{ TypeName = SynLongIdent ([SomeAttribute], [], [None])
+                         ArgExpr =
+                          Const
+                            (Unit,
+                             /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,2--3,15))
+                         Target = None
+                         AppliesToGetterAndSetter = false
+                         Range =
+                          /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,2--3,15) }]
+                     Range =
+                      /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,0--3,17) }],
+                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (5,4--5,5)),
+                  None,
+                  Const
+                    (Int32 12,
+                     /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (5,8--5,10)),
+                  /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,0--5,5),
+                  Yes
+                    /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,0--5,10),
+                  { LeadingKeyword =
+                     Let
+                       /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (5,0--5,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (5,6--5,7) })],
+              /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,0--5,10))],
+          PreXmlDocEmpty, [], None,
+          /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,0--6,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (4,0--4,15)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs b/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs
rename to tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs
diff --git a/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl b/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
new file mode 100644
index 00000000000..781e72a288c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
@@ -0,0 +1,131 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs", false,
+      QualifiedNameOfFile TupleReturnTypeOfBindingShouldContainStars, [], [],
+      [SynModuleOrNamespace
+         ([TupleReturnTypeOfBindingShouldContainStars], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (a, None), false, None,
+                     /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,4--2,5)),
+                  Some
+                    (SynBindingReturnInfo
+                       (Tuple
+                          (false,
+                           [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                            Star
+                              /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,12--2,13);
+                            Type
+                              (LongIdent (SynLongIdent ([string], [], [None])))],
+                           /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,20)),
+                        /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,20),
+                        [],
+                        { ColonRange =
+                           Some
+                             /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,6--2,7) })),
+                  Typed
+                    (App
+                       (NonAtomic, false, Ident failwith,
+                        Const
+                          (String
+                             ("todo", Regular,
+                              /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,32--2,38)),
+                           /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,32--2,38)),
+                        /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,23--2,38)),
+                     Tuple
+                       (false,
+                        [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                         Star
+                           /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,12--2,13);
+                         Type (LongIdent (SynLongIdent ([string], [], [None])))],
+                        /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,20)),
+                     /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,23--2,38)),
+                  /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,4--2,5),
+                  Yes
+                    /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,38),
+                  { LeadingKeyword =
+                     Let
+                       /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,21--2,22) })],
+              /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,38));
+           Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (b, None), false, None,
+                     /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,4--3,5)),
+                  Some
+                    (SynBindingReturnInfo
+                       (Tuple
+                          (false,
+                           [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                            Star
+                              /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,12--3,13);
+                            Type
+                              (LongIdent (SynLongIdent ([string], [], [None])));
+                            Star
+                              /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,21--3,22);
+                            Type (LongIdent (SynLongIdent ([bool], [], [None])))],
+                           /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,8--3,27)),
+                        /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,8--3,27),
+                        [],
+                        { ColonRange =
+                           Some
+                             /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,6--3,7) })),
+                  Typed
+                    (Tuple
+                       (false,
+                        [Const
+                           (Int32 1,
+                            /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,30--3,31));
+                         Const
+                           (String
+                              ("", Regular,
+                               /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,33--3,35)),
+                            /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,33--3,35));
+                         Const
+                           (Bool false,
+                            /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,37--3,42))],
+                        [/root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,31--3,32);
+                         /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,35--3,36)],
+                        /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,30--3,42)),
+                     Tuple
+                       (false,
+                        [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                         Star
+                           /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,12--3,13);
+                         Type (LongIdent (SynLongIdent ([string], [], [None])));
+                         Star
+                           /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,21--3,22);
+                         Type (LongIdent (SynLongIdent ([bool], [], [None])))],
+                        /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,8--3,27)),
+                     /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,30--3,42)),
+                  /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,4--3,5),
+                  Yes
+                    /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,0--3,42),
+                  { LeadingKeyword =
+                     Let
+                       /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,0--3,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,28--3,29) })],
+              /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (3,0--3,42))],
+          PreXmlDocEmpty, [], None,
+          /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs
rename to tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs
diff --git a/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl
similarity index 50%
rename from tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs.bsl
rename to tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl
index 90c53620634..c166d7d1174 100644
--- a/tests/service/data/SyntaxTree/BlockCommentInSourceCode.fs.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/BlockCommentInSourceCode.fs", false,
+     ("/root/CodeComment/BlockCommentInSourceCode.fs", false,
       QualifiedNameOfFile BlockCommentInSourceCode, [], [],
       [SynModuleOrNamespace
          ([BlockCommentInSourceCode], false, AnonModule,
@@ -19,8 +19,10 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (c, None), false, None,
-                           /root/BlockCommentInSourceCode.fs (2,15--2,16))],
-                     None, /root/BlockCommentInSourceCode.fs (2,4--2,16)), None,
+                           /root/CodeComment/BlockCommentInSourceCode.fs (2,15--2,16))],
+                     None,
+                     /root/CodeComment/BlockCommentInSourceCode.fs (2,4--2,16)),
+                  None,
                   App
                     (NonAtomic, false,
                      App
@@ -29,20 +31,28 @@ ImplFile
                           (false,
                            SynLongIdent
                              ([op_Addition], [], [Some (OriginalNotation "+")]),
-                           None, /root/BlockCommentInSourceCode.fs (2,21--2,22)),
-                        Ident c, /root/BlockCommentInSourceCode.fs (2,19--2,22)),
+                           None,
+                           /root/CodeComment/BlockCommentInSourceCode.fs (2,21--2,22)),
+                        Ident c,
+                        /root/CodeComment/BlockCommentInSourceCode.fs (2,19--2,22)),
                      Const
-                       (Int32 42, /root/BlockCommentInSourceCode.fs (2,23--2,25)),
-                     /root/BlockCommentInSourceCode.fs (2,19--2,25)),
-                  /root/BlockCommentInSourceCode.fs (2,4--2,16), NoneAtLet,
+                       (Int32 42,
+                        /root/CodeComment/BlockCommentInSourceCode.fs (2,23--2,25)),
+                     /root/CodeComment/BlockCommentInSourceCode.fs (2,19--2,25)),
+                  /root/CodeComment/BlockCommentInSourceCode.fs (2,4--2,16),
+                  NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/BlockCommentInSourceCode.fs (2,0--2,3)
+                     Let
+                       /root/CodeComment/BlockCommentInSourceCode.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
-                     Some /root/BlockCommentInSourceCode.fs (2,17--2,18) })],
-              /root/BlockCommentInSourceCode.fs (2,0--2,25))], PreXmlDocEmpty,
-          [], None, /root/BlockCommentInSourceCode.fs (2,0--3,0),
+                     Some
+                       /root/CodeComment/BlockCommentInSourceCode.fs (2,17--2,18) })],
+              /root/CodeComment/BlockCommentInSourceCode.fs (2,0--2,25))],
+          PreXmlDocEmpty, [], None,
+          /root/CodeComment/BlockCommentInSourceCode.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
-         [BlockComment /root/BlockCommentInSourceCode.fs (2,6--2,13)] }, set []))
\ No newline at end of file
+         [BlockComment /root/CodeComment/BlockCommentInSourceCode.fs (2,6--2,13)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi
rename to tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi
diff --git a/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi.bsl
rename to tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl
index 727d7deaac8..a5b6412322e 100644
--- a/tests/service/data/SyntaxTree/BlockCommentInSourceCode,SignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl
@@ -1,7 +1,7 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/BlockCommentInSourceCode,SignatureFile.fsi",
-      QualifiedNameOfFile BlockCommentInSourceCode,SignatureFile, [], [],
+     ("/root/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi",
+      QualifiedNameOfFile BlockCommentInSourceCodeSignatureFile, [], [],
       [SynModuleOrNamespaceSig
          ([Meh], false, DeclaredNamespace,
           [Val
@@ -11,21 +11,21 @@ SigFile
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
                  PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
                  None,
-                 /root/BlockCommentInSourceCode,SignatureFile.fsi (4,0--4,19),
+                 /root/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi (4,0--4,19),
                  { LeadingKeyword =
                     Val
-                      /root/BlockCommentInSourceCode,SignatureFile.fsi (4,0--4,3)
+                      /root/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi (4,0--4,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/BlockCommentInSourceCode,SignatureFile.fsi (4,0--4,19))],
+              /root/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi (4,0--4,19))],
           PreXmlDocEmpty, [], None,
-          /root/BlockCommentInSourceCode,SignatureFile.fsi (2,0--4,19),
+          /root/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi (2,0--4,19),
           { LeadingKeyword =
              Namespace
-               /root/BlockCommentInSourceCode,SignatureFile.fsi (2,0--2,9) })],
+               /root/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments =
          [BlockComment
-            /root/BlockCommentInSourceCode,SignatureFile.fsi (4,6--4,13)] },
+            /root/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi (4,6--4,13)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/CommentAfterSourceCode.fs
rename to tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs
diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl
new file mode 100644
index 00000000000..ceb82a64d3f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl
@@ -0,0 +1,20 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/CodeComment/CommentAfterSourceCode.fs", false,
+      QualifiedNameOfFile CommentAfterSourceCode, [], [],
+      [SynModuleOrNamespace
+         ([CommentAfterSourceCode], false, AnonModule,
+          [Expr
+             (App
+                (Atomic, false, Ident foo,
+                 Const
+                   (Unit, /root/CodeComment/CommentAfterSourceCode.fs (2,3--2,5)),
+                 /root/CodeComment/CommentAfterSourceCode.fs (2,0--2,5)),
+              /root/CodeComment/CommentAfterSourceCode.fs (2,0--2,5))],
+          PreXmlDocEmpty, [], None,
+          /root/CodeComment/CommentAfterSourceCode.fs (2,0--2,5),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/CodeComment/CommentAfterSourceCode.fs (2,6--2,17)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi
rename to tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi
diff --git a/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi.bsl
rename to tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl
index f93aab2a2d2..c1009f3370b 100644
--- a/tests/service/data/SyntaxTree/CommentAfterSourceCode,SignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl
@@ -1,7 +1,7 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/CommentAfterSourceCode,SignatureFile.fsi",
-      QualifiedNameOfFile CommentAfterSourceCode,SignatureFile, [], [],
+     ("/root/CodeComment/CommentAfterSourceCodeSignatureFile.fsi",
+      QualifiedNameOfFile CommentAfterSourceCodeSignatureFile, [], [],
       [SynModuleOrNamespaceSig
          ([Meh], false, DeclaredNamespace,
           [Val
@@ -11,20 +11,21 @@ SigFile
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
                  PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
                  None,
-                 /root/CommentAfterSourceCode,SignatureFile.fsi (4,0--4,13),
+                 /root/CodeComment/CommentAfterSourceCodeSignatureFile.fsi (4,0--4,13),
                  { LeadingKeyword =
                     Val
-                      /root/CommentAfterSourceCode,SignatureFile.fsi (4,0--4,3)
+                      /root/CodeComment/CommentAfterSourceCodeSignatureFile.fsi (4,0--4,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/CommentAfterSourceCode,SignatureFile.fsi (4,0--4,13))],
+              /root/CodeComment/CommentAfterSourceCodeSignatureFile.fsi (4,0--4,13))],
           PreXmlDocEmpty, [], None,
-          /root/CommentAfterSourceCode,SignatureFile.fsi (2,0--4,13),
+          /root/CodeComment/CommentAfterSourceCodeSignatureFile.fsi (2,0--4,13),
           { LeadingKeyword =
-             Namespace /root/CommentAfterSourceCode,SignatureFile.fsi (2,0--2,9) })],
+             Namespace
+               /root/CodeComment/CommentAfterSourceCodeSignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/CommentAfterSourceCode,SignatureFile.fsi (4,14--4,25)] },
+            /root/CodeComment/CommentAfterSourceCodeSignatureFile.fsi (4,14--4,25)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs b/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/CommentAtEndOfFile.fs
rename to tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs
diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl
new file mode 100644
index 00000000000..0975ee371ff
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl
@@ -0,0 +1,14 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/CodeComment/CommentAtEndOfFile.fs", false,
+      QualifiedNameOfFile CommentAtEndOfFile, [], [],
+      [SynModuleOrNamespace
+         ([CommentAtEndOfFile], false, AnonModule,
+          [Expr (Ident x, /root/CodeComment/CommentAtEndOfFile.fs (2,0--2,1))],
+          PreXmlDocEmpty, [], None,
+          /root/CodeComment/CommentAtEndOfFile.fs (2,0--2,1),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/CodeComment/CommentAtEndOfFile.fs (2,2--2,6)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentOnSingleLine.fs b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/CommentOnSingleLine.fs
rename to tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs
diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl
new file mode 100644
index 00000000000..676bc2adcff
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl
@@ -0,0 +1,20 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/CodeComment/CommentOnSingleLine.fs", false,
+      QualifiedNameOfFile CommentOnSingleLine, [], [],
+      [SynModuleOrNamespace
+         ([CommentOnSingleLine], false, AnonModule,
+          [Expr
+             (App
+                (Atomic, false, Ident foo,
+                 Const
+                   (Unit, /root/CodeComment/CommentOnSingleLine.fs (3,3--3,5)),
+                 /root/CodeComment/CommentOnSingleLine.fs (3,0--3,5)),
+              /root/CodeComment/CommentOnSingleLine.fs (3,0--3,5))],
+          PreXmlDocEmpty, [], None,
+          /root/CodeComment/CommentOnSingleLine.fs (3,0--3,5),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/CodeComment/CommentOnSingleLine.fs (2,0--2,11)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi
rename to tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi
diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl
new file mode 100644
index 00000000000..10e8b09c983
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl
@@ -0,0 +1,15 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/CodeComment/CommentOnSingleLineSignatureFile.fsi",
+      QualifiedNameOfFile CommentOnSingleLineSignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, DeclaredNamespace, [], PreXmlDocEmpty, [], None,
+          /root/CodeComment/CommentOnSingleLineSignatureFile.fsi (2,0--2,13),
+          { LeadingKeyword =
+             Namespace
+               /root/CodeComment/CommentOnSingleLineSignatureFile.fsi (2,0--2,9) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/CodeComment/CommentOnSingleLineSignatureFile.fsi (3,0--3,11)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs
rename to tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs
diff --git a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl
new file mode 100644
index 00000000000..941d33f1387
--- /dev/null
+++ b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl
@@ -0,0 +1,71 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs",
+      false,
+      QualifiedNameOfFile
+        TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation, [], [],
+      [SynModuleOrNamespace
+         ([TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation], false,
+          AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (x, None), false, None,
+                     /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (3,4--3,5)),
+                  None,
+                  Sequential
+                    (SuppressNeither, true,
+                     While
+                       (Yes
+                          /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (8,4--8,14),
+                        Const
+                          (Bool true,
+                           /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (8,10--8,14)),
+                        Const
+                          (Unit,
+                           /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (8,18--8,20)),
+                        /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (8,4--8,20)),
+                     App
+                       (NonAtomic, false,
+                        App
+                          (NonAtomic, true,
+                           LongIdent
+                             (false,
+                              SynLongIdent
+                                ([op_Addition], [],
+                                 [Some (OriginalNotation "+")]), None,
+                              /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (9,6--9,7)),
+                           Ident a,
+                           /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (9,4--9,7)),
+                        Const
+                          (Int32 1,
+                           /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (9,8--9,9)),
+                        /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (9,4--9,9)),
+                     /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (8,4--9,9)),
+                  /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (2,0--3,5),
+                  NoneAtLet,
+                  { LeadingKeyword =
+                     Let
+                       /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (3,0--3,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (3,6--3,7) })],
+              /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (2,0--9,9))],
+          PreXmlDocEmpty, [], None,
+          /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (3,0--10,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (4,4--4,40);
+          LineComment
+            /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (6,4--6,36);
+          LineComment
+            /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (7,4--7,27)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs
rename to tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs
diff --git a/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs.bsl
rename to tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl
index 4f7beb0e2e5..8fe57e81916 100644
--- a/tests/service/data/SyntaxTree/TripleSlashCommentShouldNotBeCaptured.fs.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/TripleSlashCommentShouldNotBeCaptured.fs", false,
+     ("/root/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs", false,
       QualifiedNameOfFile TripleSlashCommentShouldNotBeCaptured, [], [],
       [SynModuleOrNamespace
          ([TripleSlashCommentShouldNotBeCaptured], false, AnonModule,
@@ -13,23 +13,24 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (x, None), false, None,
-                     /root/TripleSlashCommentShouldNotBeCaptured.fs (3,4--3,5)),
+                     /root/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs (3,4--3,5)),
                   None,
                   Const
                     (Int32 0,
-                     /root/TripleSlashCommentShouldNotBeCaptured.fs (3,8--3,9)),
-                  /root/TripleSlashCommentShouldNotBeCaptured.fs (2,0--3,5),
-                  Yes /root/TripleSlashCommentShouldNotBeCaptured.fs (3,0--3,9),
+                     /root/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs (3,8--3,9)),
+                  /root/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs (2,0--3,5),
+                  Yes
+                    /root/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs (3,0--3,9),
                   { LeadingKeyword =
                      Let
-                       /root/TripleSlashCommentShouldNotBeCaptured.fs (3,0--3,3)
+                       /root/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs (3,0--3,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/TripleSlashCommentShouldNotBeCaptured.fs (3,6--3,7) })],
-              /root/TripleSlashCommentShouldNotBeCaptured.fs (2,0--3,9))],
+                       /root/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs (3,6--3,7) })],
+              /root/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs (2,0--3,9))],
           PreXmlDocEmpty, [], None,
-          /root/TripleSlashCommentShouldNotBeCaptured.fs (3,0--4,0),
+          /root/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs (3,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs.bsl b/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs.bsl
deleted file mode 100644
index 68753b24fa3..00000000000
--- a/tests/service/data/SyntaxTree/CommentAfterSourceCode.fs.bsl
+++ /dev/null
@@ -1,17 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/CommentAfterSourceCode.fs", false,
-      QualifiedNameOfFile CommentAfterSourceCode, [], [],
-      [SynModuleOrNamespace
-         ([CommentAfterSourceCode], false, AnonModule,
-          [Expr
-             (App
-                (Atomic, false, Ident foo,
-                 Const (Unit, /root/CommentAfterSourceCode.fs (2,3--2,5)),
-                 /root/CommentAfterSourceCode.fs (2,0--2,5)),
-              /root/CommentAfterSourceCode.fs (2,0--2,5))], PreXmlDocEmpty, [],
-          None, /root/CommentAfterSourceCode.fs (2,0--2,5),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [LineComment /root/CommentAfterSourceCode.fs (2,6--2,17)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs.bsl b/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs.bsl
deleted file mode 100644
index 47509b108ec..00000000000
--- a/tests/service/data/SyntaxTree/CommentAtEndOfFile.fs.bsl
+++ /dev/null
@@ -1,12 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/CommentAtEndOfFile.fs", false,
-      QualifiedNameOfFile CommentAtEndOfFile, [], [],
-      [SynModuleOrNamespace
-         ([CommentAtEndOfFile], false, AnonModule,
-          [Expr (Ident x, /root/CommentAtEndOfFile.fs (2,0--2,1))],
-          PreXmlDocEmpty, [], None, /root/CommentAtEndOfFile.fs (2,0--2,1),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [LineComment /root/CommentAtEndOfFile.fs (2,2--2,6)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs.bsl b/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs.bsl
deleted file mode 100644
index b8d64152334..00000000000
--- a/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs.bsl
+++ /dev/null
@@ -1,36 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/CommentBetweenElseAndIf.fs", false,
-      QualifiedNameOfFile CommentBetweenElseAndIf, [], [],
-      [SynModuleOrNamespace
-         ([CommentBetweenElseAndIf], false, AnonModule,
-          [Expr
-             (IfThenElse
-                (Ident a, Ident b,
-                 Some
-                   (IfThenElse
-                      (Ident c, Ident d, None,
-                       Yes /root/CommentBetweenElseAndIf.fs (4,34--4,43), false,
-                       /root/CommentBetweenElseAndIf.fs (4,34--5,1),
-                       { IfKeyword =
-                          /root/CommentBetweenElseAndIf.fs (4,34--4,36)
-                         IsElif = false
-                         ThenKeyword =
-                          /root/CommentBetweenElseAndIf.fs (4,39--4,43)
-                         ElseKeyword = None
-                         IfToThenRange =
-                          /root/CommentBetweenElseAndIf.fs (4,34--4,43) })),
-                 Yes /root/CommentBetweenElseAndIf.fs (2,0--2,9), false,
-                 /root/CommentBetweenElseAndIf.fs (2,0--5,1),
-                 { IfKeyword = /root/CommentBetweenElseAndIf.fs (2,0--2,2)
-                   IsElif = false
-                   ThenKeyword = /root/CommentBetweenElseAndIf.fs (2,5--2,9)
-                   ElseKeyword =
-                    Some /root/CommentBetweenElseAndIf.fs (4,0--4,4)
-                   IfToThenRange = /root/CommentBetweenElseAndIf.fs (2,0--2,9) }),
-              /root/CommentBetweenElseAndIf.fs (2,0--5,1))], PreXmlDocEmpty, [],
-          None, /root/CommentBetweenElseAndIf.fs (2,0--6,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments =
-         [BlockComment /root/CommentBetweenElseAndIf.fs (4,5--4,33)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi.bsl
deleted file mode 100644
index c78da3ff460..00000000000
--- a/tests/service/data/SyntaxTree/CommentOnSingleLine,SignatureFile.fsi.bsl
+++ /dev/null
@@ -1,13 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/CommentOnSingleLine,SignatureFile.fsi",
-      QualifiedNameOfFile CommentOnSingleLine,SignatureFile, [], [],
-      [SynModuleOrNamespaceSig
-         ([Meh], false, DeclaredNamespace, [], PreXmlDocEmpty, [], None,
-          /root/CommentOnSingleLine,SignatureFile.fsi (2,0--2,13),
-          { LeadingKeyword =
-             Namespace /root/CommentOnSingleLine,SignatureFile.fsi (2,0--2,9) })],
-      { ConditionalDirectives = []
-        CodeComments =
-         [LineComment /root/CommentOnSingleLine,SignatureFile.fsi (3,0--3,11)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentOnSingleLine.fs.bsl b/tests/service/data/SyntaxTree/CommentOnSingleLine.fs.bsl
deleted file mode 100644
index 1b9cbbebded..00000000000
--- a/tests/service/data/SyntaxTree/CommentOnSingleLine.fs.bsl
+++ /dev/null
@@ -1,17 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/CommentOnSingleLine.fs", false,
-      QualifiedNameOfFile CommentOnSingleLine, [], [],
-      [SynModuleOrNamespace
-         ([CommentOnSingleLine], false, AnonModule,
-          [Expr
-             (App
-                (Atomic, false, Ident foo,
-                 Const (Unit, /root/CommentOnSingleLine.fs (3,3--3,5)),
-                 /root/CommentOnSingleLine.fs (3,0--3,5)),
-              /root/CommentOnSingleLine.fs (3,0--3,5))], PreXmlDocEmpty, [],
-          None, /root/CommentOnSingleLine.fs (3,0--3,5),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [LineComment /root/CommentOnSingleLine.fs (2,0--2,11)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs b/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs
rename to tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs
diff --git a/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl
new file mode 100644
index 00000000000..524600f6d8d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl
@@ -0,0 +1,79 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs",
+      false,
+      QualifiedNameOfFile
+        MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression, [],
+      [],
+      [SynModuleOrNamespace
+         ([MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression],
+          false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false, Ident async,
+                 ComputationExpr
+                   (false,
+                    LetOrUseBang
+                      (Yes
+                         /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (3,4--3,24),
+                       false, true,
+                       Named
+                         (SynIdent (bar, None), false, None,
+                          /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (3,9--3,12)),
+                       App
+                         (NonAtomic, false, Ident getBar,
+                          Const
+                            (Unit,
+                             /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (3,22--3,24)),
+                          /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (3,15--3,24)),
+                       [SynExprAndBang
+                          (Yes
+                             /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (4,4--4,27),
+                           false, true,
+                           Named
+                             (SynIdent (foo, None), false, None,
+                              /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (4,9--4,12)),
+                           App
+                             (NonAtomic, false, Ident getFoo,
+                              Const
+                                (Unit,
+                                 /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (4,22--4,24)),
+                              /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (4,15--4,24)),
+                           /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (4,4--4,24),
+                           { EqualsRange =
+                              /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (4,13--4,14)
+                             InKeyword =
+                              Some
+                                /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (4,25--4,27) });
+                        SynExprAndBang
+                          (Yes
+                             /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (5,4--6,10),
+                           false, true,
+                           Named
+                             (SynIdent (meh, None), false, None,
+                              /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (5,9--5,12)),
+                           App
+                             (NonAtomic, false, Ident getMeh,
+                              Const
+                                (Unit,
+                                 /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (5,22--5,24)),
+                              /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (5,15--5,24)),
+                           /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (5,4--5,24),
+                           { EqualsRange =
+                              /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (5,13--5,14)
+                             InKeyword = None })],
+                       YieldOrReturn
+                         ((false, true), Ident bar,
+                          /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (6,4--6,14)),
+                       /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (3,4--6,14),
+                       { EqualsRange =
+                          Some
+                            /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (3,13--3,14) }),
+                    /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (2,6--7,1)),
+                 /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (2,0--7,1)),
+              /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (2,0--7,1))],
+          PreXmlDocEmpty, [], None,
+          /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (2,0--7,1),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs b/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs
rename to tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs
diff --git a/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl
new file mode 100644
index 00000000000..f35536a8fa5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl
@@ -0,0 +1,59 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs",
+      false,
+      QualifiedNameOfFile SynExprAndBangRangeStartsAtAndAndEndsAfterExpression,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynExprAndBangRangeStartsAtAndAndEndsAfterExpression], false,
+          AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false, Ident async,
+                 ComputationExpr
+                   (false,
+                    LetOrUseBang
+                      (Yes
+                         /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (3,4--3,24),
+                       false, true,
+                       Named
+                         (SynIdent (bar, None), false, None,
+                          /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (3,9--3,12)),
+                       App
+                         (NonAtomic, false, Ident getBar,
+                          Const
+                            (Unit,
+                             /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (3,22--3,24)),
+                          /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (3,15--3,24)),
+                       [SynExprAndBang
+                          (Yes
+                             /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (5,4--7,10),
+                           false, true,
+                           Named
+                             (SynIdent (foo, None), false, None,
+                              /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (5,9--5,12)),
+                           App
+                             (NonAtomic, false, Ident getFoo,
+                              Const
+                                (Unit,
+                                 /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (5,22--5,24)),
+                              /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (5,15--5,24)),
+                           /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (5,4--5,24),
+                           { EqualsRange =
+                              /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (5,13--5,14)
+                             InKeyword = None })],
+                       YieldOrReturn
+                         ((false, true), Ident bar,
+                          /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (7,4--7,14)),
+                       /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (3,4--7,14),
+                       { EqualsRange =
+                          Some
+                            /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (3,13--3,14) }),
+                    /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (2,6--8,1)),
+                 /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (2,0--8,1)),
+              /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (2,0--8,1))],
+          PreXmlDocEmpty, [], None,
+          /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (2,0--8,1),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs
rename to tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
new file mode 100644
index 00000000000..8f6dfb42075
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
@@ -0,0 +1,42 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs",
+      false,
+      QualifiedNameOfFile DirectivesInMultilineCommentAreNotReportedAsTrivia, [],
+      [],
+      [SynModuleOrNamespace
+         ([DirectivesInMultilineCommentAreNotReportedAsTrivia], false,
+          AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,4--2,5)),
+                  None,
+                  Const
+                    (Int32 42,
+                     /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (8,0--8,2)),
+                  /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,4--2,5),
+                  Yes
+                    /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--8,2),
+                  { LeadingKeyword =
+                     Let
+                       /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,6--2,7) })],
+              /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--8,2))],
+          PreXmlDocEmpty, [], None,
+          /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--9,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [BlockComment
+            /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (3,0--7,2)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi
rename to tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl
new file mode 100644
index 00000000000..fe842a3dcc9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl
@@ -0,0 +1,37 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi",
+      QualifiedNameOfFile
+        DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Foobar], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (v, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 Some
+                   (Const
+                      (Int32 42,
+                       /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi (10,0--10,2))),
+                 /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi (4,0--10,2),
+                 { LeadingKeyword =
+                    Val
+                      /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi (4,0--4,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange =
+                    Some
+                      /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi (4,12--4,13) }),
+              /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi (4,0--10,2))],
+          PreXmlDocEmpty, [], None,
+          /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi (2,0--10,2),
+          { LeadingKeyword =
+             Namespace
+               /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi (2,0--2,9) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [BlockComment
+            /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi (5,0--9,2)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs
rename to tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
similarity index 51%
rename from tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
rename to tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
index 69bba87af27..87cfc9b08e2 100644
--- a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs", false,
+     ("/root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs",
+      false,
       QualifiedNameOfFile DirectivesInMultilineStringAreNotReportedAsTrivia, [],
       [],
       [SynModuleOrNamespace
@@ -14,24 +15,24 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (v, None), false, None,
-                     /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,4--2,5)),
+                     /root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,4--2,5)),
                   None,
                   ArbitraryAfterError
                     ("localBinding1",
-                     /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,7--2,7)),
-                  /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,4--2,5),
+                     /root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,7--2,7)),
+                  /root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,4--2,5),
                   Yes
-                    /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,4--2,7),
+                    /root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,4--2,7),
                   { LeadingKeyword =
                      Let
-                       /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,0--2,3)
+                       /root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,6--2,7) })],
-              /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,0--2,7))],
+                       /root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,6--2,7) })],
+              /root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,0--2,7))],
           PreXmlDocEmpty, [], None,
-          /root/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,0--8,0),
+          /root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,0--8,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi
rename to tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl
new file mode 100644
index 00000000000..7bf08537a72
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl
@@ -0,0 +1,13 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi",
+      QualifiedNameOfFile
+        DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Foobar], false, DeclaredNamespace, [], PreXmlDocEmpty, [], None,
+          /root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi (2,0--2,16),
+          { LeadingKeyword =
+             Namespace
+               /root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi (2,0--2,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfElseEndif.fs b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NestedIfElseEndif.fs
rename to tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl
new file mode 100644
index 00000000000..99b38f9e781
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl
@@ -0,0 +1,46 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ConditionalDirective/NestedIfElseEndif.fs", false,
+      QualifiedNameOfFile NestedIfElseEndif, [], [],
+      [SynModuleOrNamespace
+         ([NestedIfElseEndif], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/ConditionalDirective/NestedIfElseEndif.fs (2,4--2,5)),
+                  None,
+                  Const
+                    (Int32 3,
+                     /root/ConditionalDirective/NestedIfElseEndif.fs (10,8--10,9)),
+                  /root/ConditionalDirective/NestedIfElseEndif.fs (2,4--2,5),
+                  Yes
+                    /root/ConditionalDirective/NestedIfElseEndif.fs (2,0--10,9),
+                  { LeadingKeyword =
+                     Let
+                       /root/ConditionalDirective/NestedIfElseEndif.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/ConditionalDirective/NestedIfElseEndif.fs (2,6--2,7) })],
+              /root/ConditionalDirective/NestedIfElseEndif.fs (2,0--10,9))],
+          PreXmlDocEmpty, [], None,
+          /root/ConditionalDirective/NestedIfElseEndif.fs (2,0--12,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives =
+         [If
+            (Ident "FOO",
+             /root/ConditionalDirective/NestedIfElseEndif.fs (3,4--3,11));
+          If
+            (Ident "MEH",
+             /root/ConditionalDirective/NestedIfElseEndif.fs (4,8--4,15));
+          Else /root/ConditionalDirective/NestedIfElseEndif.fs (6,8--6,13);
+          EndIf /root/ConditionalDirective/NestedIfElseEndif.fs (8,8--8,14);
+          Else /root/ConditionalDirective/NestedIfElseEndif.fs (9,4--9,9);
+          EndIf /root/ConditionalDirective/NestedIfElseEndif.fs (11,4--11,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi
rename to tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl
new file mode 100644
index 00000000000..267aa3303de
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl
@@ -0,0 +1,47 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi",
+      QualifiedNameOfFile NestedIfElseEndifSignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Foobar], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (v, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 Some
+                   (Const
+                      (Int32 3,
+                       /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (12,8--12,9))),
+                 /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (4,0--12,9),
+                 { LeadingKeyword =
+                    Val
+                      /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (4,0--4,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange =
+                    Some
+                      /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (4,12--4,13) }),
+              /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (4,0--12,9))],
+          PreXmlDocEmpty, [], None,
+          /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (2,0--12,9),
+          { LeadingKeyword =
+             Namespace
+               /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (2,0--2,9) })],
+      { ConditionalDirectives =
+         [If
+            (Ident "FOO",
+             /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (5,4--5,11));
+          If
+            (Ident "MEH",
+             /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (6,8--6,15));
+          Else
+            /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (8,8--8,13);
+          EndIf
+            /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (10,8--10,14);
+          Else
+            /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (11,4--11,9);
+          EndIf
+            /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (13,4--13,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs
rename to tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl
new file mode 100644
index 00000000000..8886afca195
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl
@@ -0,0 +1,51 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs", false,
+      QualifiedNameOfFile NestedIfEndifWithComplexExpressions, [], [],
+      [SynModuleOrNamespace
+         ([NestedIfEndifWithComplexExpressions], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (2,4--2,5)),
+                  None,
+                  ArbitraryAfterError
+                    ("localBinding1",
+                     /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (2,7--2,7)),
+                  /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (2,4--2,5),
+                  Yes
+                    /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (2,4--2,7),
+                  { LeadingKeyword =
+                     Let
+                       /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (2,6--2,7) })],
+              /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (2,0--2,7))],
+          PreXmlDocEmpty, [], None,
+          /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (2,0--10,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives =
+         [If
+            (Not (Ident "DEBUG"),
+             /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (3,4--3,14));
+          If
+            (And (Ident "FOO", Ident "BAR"),
+             /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (4,8--4,22));
+          If
+            (Or (Ident "MEH", Ident "HMM"),
+             /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (5,12--5,26));
+          EndIf
+            /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (7,12--7,18);
+          EndIf
+            /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (8,8--8,14);
+          EndIf
+            /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (9,4--9,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi
rename to tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl
new file mode 100644
index 00000000000..0ce4b9068a6
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl
@@ -0,0 +1,49 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi",
+      QualifiedNameOfFile NestedIfEndifWithComplexExpressionsSignatureFile, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([Foobar], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (v, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 Some
+                   (Const
+                      (Int32 10,
+                       /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (12,4--12,6))),
+                 /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (4,0--12,6),
+                 { LeadingKeyword =
+                    Val
+                      /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (4,0--4,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange =
+                    Some
+                      /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (4,12--4,13) }),
+              /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (4,0--12,6))],
+          PreXmlDocEmpty, [], None,
+          /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (2,0--12,6),
+          { LeadingKeyword =
+             Namespace
+               /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (2,0--2,9) })],
+      { ConditionalDirectives =
+         [If
+            (Not (Ident "DEBUG"),
+             /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (5,4--5,14));
+          If
+            (And (Ident "FOO", Ident "BAR"),
+             /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (6,8--6,22));
+          If
+            (Or (Ident "MEH", Ident "HMM"),
+             /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (7,12--7,26));
+          EndIf
+            /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (9,12--9,18);
+          EndIf
+            /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (10,8--10,14);
+          EndIf
+            /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (11,4--11,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfElseEndif.fs b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SingleIfElseEndif.fs
rename to tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl
new file mode 100644
index 00000000000..8b693fdacbd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl
@@ -0,0 +1,40 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ConditionalDirective/SingleIfElseEndif.fs", false,
+      QualifiedNameOfFile SingleIfElseEndif, [], [],
+      [SynModuleOrNamespace
+         ([SingleIfElseEndif], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/ConditionalDirective/SingleIfElseEndif.fs (2,4--2,5)),
+                  None,
+                  Const
+                    (Int32 42,
+                     /root/ConditionalDirective/SingleIfElseEndif.fs (6,4--6,6)),
+                  /root/ConditionalDirective/SingleIfElseEndif.fs (2,4--2,5),
+                  Yes /root/ConditionalDirective/SingleIfElseEndif.fs (2,0--6,6),
+                  { LeadingKeyword =
+                     Let
+                       /root/ConditionalDirective/SingleIfElseEndif.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/ConditionalDirective/SingleIfElseEndif.fs (2,6--2,7) })],
+              /root/ConditionalDirective/SingleIfElseEndif.fs (2,0--6,6))],
+          PreXmlDocEmpty, [], None,
+          /root/ConditionalDirective/SingleIfElseEndif.fs (2,0--8,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives =
+         [If
+            (Ident "DEBUG",
+             /root/ConditionalDirective/SingleIfElseEndif.fs (3,4--3,13));
+          Else /root/ConditionalDirective/SingleIfElseEndif.fs (5,4--5,9);
+          EndIf /root/ConditionalDirective/SingleIfElseEndif.fs (7,4--7,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi
rename to tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl
new file mode 100644
index 00000000000..e474fe5a17f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl
@@ -0,0 +1,40 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi",
+      QualifiedNameOfFile SingleIfElseEndifSignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Foobar], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (v, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 Some
+                   (Const
+                      (Int32 42,
+                       /root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi (8,4--8,6))),
+                 /root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi (4,0--8,6),
+                 { LeadingKeyword =
+                    Val
+                      /root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi (4,0--4,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange =
+                    Some
+                      /root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi (4,12--4,13) }),
+              /root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi (4,0--8,6))],
+          PreXmlDocEmpty, [], None,
+          /root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi (2,0--8,6),
+          { LeadingKeyword =
+             Namespace
+               /root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi (2,0--2,9) })],
+      { ConditionalDirectives =
+         [If
+            (Ident "DEBUG",
+             /root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi (5,4--5,13));
+          Else
+            /root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi (7,4--7,9);
+          EndIf
+            /root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi (9,4--9,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfEndif.fs b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SingleIfEndif.fs
rename to tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl
new file mode 100644
index 00000000000..40e277372bd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl
@@ -0,0 +1,37 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ConditionalDirective/SingleIfEndif.fs", false,
+      QualifiedNameOfFile SingleIfEndif, [], [],
+      [SynModuleOrNamespace
+         ([SingleIfEndif], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (v, None), false, None,
+                     /root/ConditionalDirective/SingleIfEndif.fs (2,4--2,5)),
+                  None,
+                  Const
+                    (Int32 42,
+                     /root/ConditionalDirective/SingleIfEndif.fs (6,4--6,6)),
+                  /root/ConditionalDirective/SingleIfEndif.fs (2,4--2,5),
+                  Yes /root/ConditionalDirective/SingleIfEndif.fs (2,0--6,6),
+                  { LeadingKeyword =
+                     Let /root/ConditionalDirective/SingleIfEndif.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some /root/ConditionalDirective/SingleIfEndif.fs (2,6--2,7) })],
+              /root/ConditionalDirective/SingleIfEndif.fs (2,0--6,6))],
+          PreXmlDocEmpty, [], None,
+          /root/ConditionalDirective/SingleIfEndif.fs (2,0--7,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives =
+         [If
+            (Ident "DEBUG",
+             /root/ConditionalDirective/SingleIfEndif.fs (3,4--3,13));
+          EndIf /root/ConditionalDirective/SingleIfEndif.fs (5,4--5,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi
rename to tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl
new file mode 100644
index 00000000000..36dcb5e7619
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl
@@ -0,0 +1,38 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/ConditionalDirective/SingleIfEndifSignatureFile.fsi",
+      QualifiedNameOfFile SingleIfEndifSignatureFile, [], [],
+      [SynModuleOrNamespaceSig
+         ([Foobar], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (v, None), SynValTyparDecls (None, true),
+                 LongIdent (SynLongIdent ([int], [], [None])),
+                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 Some
+                   (Const
+                      (Int32 42,
+                       /root/ConditionalDirective/SingleIfEndifSignatureFile.fsi (8,4--8,6))),
+                 /root/ConditionalDirective/SingleIfEndifSignatureFile.fsi (4,0--8,6),
+                 { LeadingKeyword =
+                    Val
+                      /root/ConditionalDirective/SingleIfEndifSignatureFile.fsi (4,0--4,3)
+                   InlineKeyword = None
+                   WithKeyword = None
+                   EqualsRange =
+                    Some
+                      /root/ConditionalDirective/SingleIfEndifSignatureFile.fsi (4,11--4,12) }),
+              /root/ConditionalDirective/SingleIfEndifSignatureFile.fsi (4,0--8,6))],
+          PreXmlDocEmpty, [], None,
+          /root/ConditionalDirective/SingleIfEndifSignatureFile.fsi (2,0--8,6),
+          { LeadingKeyword =
+             Namespace
+               /root/ConditionalDirective/SingleIfEndifSignatureFile.fsi (2,0--2,9) })],
+      { ConditionalDirectives =
+         [If
+            (Ident "DEBUG",
+             /root/ConditionalDirective/SingleIfEndifSignatureFile.fsi (5,4--5,13));
+          EndIf
+            /root/ConditionalDirective/SingleIfEndifSignatureFile.fsi (7,4--7,10)]
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
deleted file mode 100644
index c81c6e40d0c..00000000000
--- a/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
+++ /dev/null
@@ -1,39 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs", false,
-      QualifiedNameOfFile DeclaredNamespaceRangeShouldStartAtNamespaceKeyword,
-      [], [],
-      [SynModuleOrNamespace
-         ([TypeEquality], false, DeclaredNamespace,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([],
-                     Some
-                       (PostfixList
-                          ([SynTyparDecl ([], SynTypar (a, None, false));
-                            SynTyparDecl ([], SynTypar (b, None, false))], [],
-                           /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,8--5,16))),
-                     [], [Teq],
-                     PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     true, None,
-                     /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,5--5,8)),
-                  Simple
-                    (None
-                       /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,5--5,8),
-                     /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,5--5,8)),
-                  [], None,
-                  /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,0--5,8),
-                  { LeadingKeyword =
-                     Type
-                       /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,0--5,4)
-                    EqualsRange = None
-                    WithKeyword = None })],
-              /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,0--5,8))],
-          PreXmlDocEmpty, [], None,
-          /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (2,0--5,8),
-          { LeadingKeyword =
-             Namespace
-               /root/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (2,0--2,9) })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs.bsl
deleted file mode 100644
index 8928e27c437..00000000000
--- a/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs.bsl
+++ /dev/null
@@ -1,48 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/DeeplyNestedIfThenElse.fs", false,
-      QualifiedNameOfFile DeeplyNestedIfThenElse, [], [],
-      [SynModuleOrNamespace
-         ([DeeplyNestedIfThenElse], false, AnonModule,
-          [Expr
-             (IfThenElse
-                (Ident a, Ident b,
-                 Some
-                   (IfThenElse
-                      (Ident c, Ident d,
-                       Some
-                         (IfThenElse
-                            (Ident e, Ident f, Some (Ident g),
-                             Yes /root/DeeplyNestedIfThenElse.fs (7,8--7,17),
-                             false, /root/DeeplyNestedIfThenElse.fs (7,8--10,13),
-                             { IfKeyword =
-                                /root/DeeplyNestedIfThenElse.fs (7,8--7,10)
-                               IsElif = false
-                               ThenKeyword =
-                                /root/DeeplyNestedIfThenElse.fs (7,13--7,17)
-                               ElseKeyword =
-                                Some /root/DeeplyNestedIfThenElse.fs (9,8--9,12)
-                               IfToThenRange =
-                                /root/DeeplyNestedIfThenElse.fs (7,8--7,17) })),
-                       Yes /root/DeeplyNestedIfThenElse.fs (4,0--4,11), false,
-                       /root/DeeplyNestedIfThenElse.fs (4,0--10,13),
-                       { IfKeyword = /root/DeeplyNestedIfThenElse.fs (4,0--4,4)
-                         IsElif = true
-                         ThenKeyword =
-                          /root/DeeplyNestedIfThenElse.fs (4,7--4,11)
-                         ElseKeyword =
-                          Some /root/DeeplyNestedIfThenElse.fs (6,0--6,4)
-                         IfToThenRange =
-                          /root/DeeplyNestedIfThenElse.fs (4,0--4,11) })),
-                 Yes /root/DeeplyNestedIfThenElse.fs (2,0--2,9), false,
-                 /root/DeeplyNestedIfThenElse.fs (2,0--10,13),
-                 { IfKeyword = /root/DeeplyNestedIfThenElse.fs (2,0--2,2)
-                   IsElif = false
-                   ThenKeyword = /root/DeeplyNestedIfThenElse.fs (2,5--2,9)
-                   ElseKeyword = None
-                   IfToThenRange = /root/DeeplyNestedIfThenElse.fs (2,0--2,9) }),
-              /root/DeeplyNestedIfThenElse.fs (2,0--10,13))], PreXmlDocEmpty, [],
-          None, /root/DeeplyNestedIfThenElse.fs (2,0--11,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs.bsl
deleted file mode 100644
index d39bbd1f207..00000000000
--- a/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs.bsl
+++ /dev/null
@@ -1,101 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/DestructedLambdaHasArrowRange.fs", false,
-      QualifiedNameOfFile DestructedLambdaHasArrowRange, [], [],
-      [SynModuleOrNamespace
-         ([DestructedLambdaHasArrowRange], false, AnonModule,
-          [Expr
-             (Lambda
-                (false, false,
-                 SimplePats
-                   ([Id
-                       (_arg1, None, true, false, false,
-                        /root/DestructedLambdaHasArrowRange.fs (2,4--2,13))],
-                    /root/DestructedLambdaHasArrowRange.fs (2,4--2,13)),
-                 Match
-                   (NoneAtInvisible, Ident _arg1,
-                    [SynMatchClause
-                       (Record
-                          ([(([], X),
-                             /root/DestructedLambdaHasArrowRange.fs (2,8--2,9),
-                             Named
-                               (SynIdent (x, None), false, None,
-                                /root/DestructedLambdaHasArrowRange.fs (2,10--2,11)))],
-                           /root/DestructedLambdaHasArrowRange.fs (2,4--2,13)),
-                        None,
-                        App
-                          (NonAtomic, false,
-                           App
-                             (NonAtomic, true,
-                              LongIdent
-                                (false,
-                                 SynLongIdent
-                                   ([op_Multiply], [],
-                                    [Some (OriginalNotation "*")]), None,
-                                 /root/DestructedLambdaHasArrowRange.fs (2,19--2,20)),
-                              Ident x,
-                              /root/DestructedLambdaHasArrowRange.fs (2,17--2,20)),
-                           Const
-                             (Int32 2,
-                              /root/DestructedLambdaHasArrowRange.fs (2,21--2,22)),
-                           /root/DestructedLambdaHasArrowRange.fs (2,17--2,22)),
-                        /root/DestructedLambdaHasArrowRange.fs (2,4--2,13), No,
-                        { ArrowRange = None
-                          BarRange = None })],
-                    /root/DestructedLambdaHasArrowRange.fs (2,4--2,22),
-                    { MatchKeyword =
-                       /root/DestructedLambdaHasArrowRange.fs (2,4--2,22)
-                      WithKeyword =
-                       /root/DestructedLambdaHasArrowRange.fs (2,4--2,22) }),
-                 Some
-                   ([Record
-                       ([(([], X),
-                          /root/DestructedLambdaHasArrowRange.fs (2,8--2,9),
-                          Named
-                            (SynIdent (x, None), false, None,
-                             /root/DestructedLambdaHasArrowRange.fs (2,10--2,11)))],
-                        /root/DestructedLambdaHasArrowRange.fs (2,4--2,13))],
-                    Match
-                      (NoneAtInvisible, Ident _arg1,
-                       [SynMatchClause
-                          (Record
-                             ([(([], X),
-                                /root/DestructedLambdaHasArrowRange.fs (2,8--2,9),
-                                Named
-                                  (SynIdent (x, None), false, None,
-                                   /root/DestructedLambdaHasArrowRange.fs (2,10--2,11)))],
-                              /root/DestructedLambdaHasArrowRange.fs (2,4--2,13)),
-                           None,
-                           App
-                             (NonAtomic, false,
-                              App
-                                (NonAtomic, true,
-                                 LongIdent
-                                   (false,
-                                    SynLongIdent
-                                      ([op_Multiply], [],
-                                       [Some (OriginalNotation "*")]), None,
-                                    /root/DestructedLambdaHasArrowRange.fs (2,19--2,20)),
-                                 Ident x,
-                                 /root/DestructedLambdaHasArrowRange.fs (2,17--2,20)),
-                              Const
-                                (Int32 2,
-                                 /root/DestructedLambdaHasArrowRange.fs (2,21--2,22)),
-                              /root/DestructedLambdaHasArrowRange.fs (2,17--2,22)),
-                           /root/DestructedLambdaHasArrowRange.fs (2,4--2,13),
-                           No, { ArrowRange = None
-                                 BarRange = None })],
-                       /root/DestructedLambdaHasArrowRange.fs (2,4--2,22),
-                       { MatchKeyword =
-                          /root/DestructedLambdaHasArrowRange.fs (2,4--2,22)
-                         WithKeyword =
-                          /root/DestructedLambdaHasArrowRange.fs (2,4--2,22) })),
-                 /root/DestructedLambdaHasArrowRange.fs (2,0--2,22),
-                 { ArrowRange =
-                    Some /root/DestructedLambdaHasArrowRange.fs (2,14--2,16) }),
-              /root/DestructedLambdaHasArrowRange.fs (2,0--2,22))],
-          PreXmlDocEmpty, [], None,
-          /root/DestructedLambdaHasArrowRange.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs.bsl b/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs.bsl
deleted file mode 100644
index 7c3aad23fa2..00000000000
--- a/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs.bsl
+++ /dev/null
@@ -1,41 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/DetectDifferenceBetweenCompiledOperators.fs", false,
-      QualifiedNameOfFile DetectDifferenceBetweenCompiledOperators, [], [],
-      [SynModuleOrNamespace
-         ([DetectDifferenceBetweenCompiledOperators], false, AnonModule,
-          [Expr
-             (App
-                (NonAtomic, false,
-                 App
-                   (NonAtomic, false,
-                    LongIdent
-                      (false,
-                       SynLongIdent
-                         ([op_Addition], [],
-                          [Some
-                             (OriginalNotationWithParen
-                                (/root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,1),
-                                 "+",
-                                 /root/DetectDifferenceBetweenCompiledOperators.fs (2,2--2,3)))]),
-                       None,
-                       /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,3)),
-                    Ident a,
-                    /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,5)),
-                 Ident b,
-                 /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,7)),
-              /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,7));
-           Expr
-             (App
-                (NonAtomic, false,
-                 App
-                   (NonAtomic, false, Ident op_Addition, Ident a,
-                    /root/DetectDifferenceBetweenCompiledOperators.fs (3,0--3,13)),
-                 Ident b,
-                 /root/DetectDifferenceBetweenCompiledOperators.fs (3,0--3,15)),
-              /root/DetectDifferenceBetweenCompiledOperators.fs (3,0--3,15))],
-          PreXmlDocEmpty, [], None,
-          /root/DetectDifferenceBetweenCompiledOperators.fs (2,0--3,15),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi.bsl
deleted file mode 100644
index cf33b06921e..00000000000
--- a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi.bsl
+++ /dev/null
@@ -1,37 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi",
-      QualifiedNameOfFile
-        DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile, [], [],
-      [SynModuleOrNamespaceSig
-         ([Foobar], false, DeclaredNamespace,
-          [Val
-             (SynValSig
-                ([], SynIdent (v, None), SynValTyparDecls (None, true),
-                 LongIdent (SynLongIdent ([int], [], [None])),
-                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 Some
-                   (Const
-                      (Int32 42,
-                       /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (10,0--10,2))),
-                 /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (4,0--10,2),
-                 { LeadingKeyword =
-                    Val
-                      /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (4,0--4,3)
-                   InlineKeyword = None
-                   WithKeyword = None
-                   EqualsRange =
-                    Some
-                      /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (4,12--4,13) }),
-              /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (4,0--10,2))],
-          PreXmlDocEmpty, [], None,
-          /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (2,0--10,2),
-          { LeadingKeyword =
-             Namespace
-               /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (2,0--2,9) })],
-      { ConditionalDirectives = []
-        CodeComments =
-         [BlockComment
-            /root/DirectivesInMultilineCommentAreNotReportedAsTrivia,SignatureFile.fsi (5,0--9,2)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
deleted file mode 100644
index dcc09cf8e4f..00000000000
--- a/tests/service/data/SyntaxTree/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
+++ /dev/null
@@ -1,41 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs", false,
-      QualifiedNameOfFile DirectivesInMultilineCommentAreNotReportedAsTrivia, [],
-      [],
-      [SynModuleOrNamespace
-         ([DirectivesInMultilineCommentAreNotReportedAsTrivia], false,
-          AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (v, None), false, None,
-                     /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,4--2,5)),
-                  None,
-                  Const
-                    (Int32 42,
-                     /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (8,0--8,2)),
-                  /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,4--2,5),
-                  Yes
-                    /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--8,2),
-                  { LeadingKeyword =
-                     Let
-                       /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some
-                       /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,6--2,7) })],
-              /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--8,2))],
-          PreXmlDocEmpty, [], None,
-          /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (2,0--9,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments =
-         [BlockComment
-            /root/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (3,0--7,2)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi.bsl
deleted file mode 100644
index cb5d7710a2e..00000000000
--- a/tests/service/data/SyntaxTree/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi.bsl
+++ /dev/null
@@ -1,13 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi",
-      QualifiedNameOfFile
-        DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile, [], [],
-      [SynModuleOrNamespaceSig
-         ([Foobar], false, DeclaredNamespace, [], PreXmlDocEmpty, [], None,
-          /root/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi (2,0--2,16),
-          { LeadingKeyword =
-             Namespace
-               /root/DirectivesInMultilineStringAreNotReportedAsTrivia,SignatureFile.fsi (2,0--2,9) })],
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DoKeyword.fs.bsl b/tests/service/data/SyntaxTree/DoKeyword.fs.bsl
deleted file mode 100644
index d1e4d0ba847..00000000000
--- a/tests/service/data/SyntaxTree/DoKeyword.fs.bsl
+++ /dev/null
@@ -1,36 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/DoKeyword.fs", false, QualifiedNameOfFile DoKeyword, [], [],
-      [SynModuleOrNamespace
-         ([DoKeyword], false, AnonModule,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [X],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/DoKeyword.fs (2,5--2,6)),
-                  ObjectModel
-                    (Unspecified,
-                     [LetBindings
-                        ([SynBinding
-                            (None, Do, false, false, [], PreXmlDocEmpty,
-                             SynValData
-                               (None,
-                                SynValInfo ([], SynArgInfo ([], false, None)),
-                                None),
-                             Const (Unit, /root/DoKeyword.fs (3,4--3,9)), None,
-                             Const (Unit, /root/DoKeyword.fs (3,7--3,9)),
-                             /root/DoKeyword.fs (3,4--3,9), NoneAtDo,
-                             { LeadingKeyword = Do /root/DoKeyword.fs (3,4--3,6)
-                               InlineKeyword = None
-                               EqualsRange = None })], false, false,
-                         /root/DoKeyword.fs (3,4--3,9))],
-                     /root/DoKeyword.fs (3,4--3,9)), [], None,
-                  /root/DoKeyword.fs (2,5--3,9),
-                  { LeadingKeyword = Type /root/DoKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/DoKeyword.fs (2,7--2,8)
-                    WithKeyword = None })], /root/DoKeyword.fs (2,0--3,9))],
-          PreXmlDocEmpty, [], None, /root/DoKeyword.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DoStaticKeyword.fs.bsl b/tests/service/data/SyntaxTree/DoStaticKeyword.fs.bsl
deleted file mode 100644
index 223f7d7746d..00000000000
--- a/tests/service/data/SyntaxTree/DoStaticKeyword.fs.bsl
+++ /dev/null
@@ -1,41 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/DoStaticKeyword.fs", false, QualifiedNameOfFile DoStaticKeyword, [],
-      [],
-      [SynModuleOrNamespace
-         ([DoStaticKeyword], false, AnonModule,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [X],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/DoStaticKeyword.fs (2,5--2,6)),
-                  ObjectModel
-                    (Unspecified,
-                     [LetBindings
-                        ([SynBinding
-                            (None, Do, false, false, [], PreXmlDocEmpty,
-                             SynValData
-                               (None,
-                                SynValInfo ([], SynArgInfo ([], false, None)),
-                                None),
-                             Const (Unit, /root/DoStaticKeyword.fs (3,11--3,16)),
-                             None,
-                             Const (Unit, /root/DoStaticKeyword.fs (3,14--3,16)),
-                             /root/DoStaticKeyword.fs (3,11--3,16), NoneAtDo,
-                             { LeadingKeyword =
-                                StaticDo
-                                  (/root/DoStaticKeyword.fs (3,4--3,10),
-                                   /root/DoStaticKeyword.fs (3,11--3,13))
-                               InlineKeyword = None
-                               EqualsRange = None })], true, false,
-                         /root/DoStaticKeyword.fs (3,4--3,16))],
-                     /root/DoStaticKeyword.fs (3,4--3,16)), [], None,
-                  /root/DoStaticKeyword.fs (2,5--3,16),
-                  { LeadingKeyword = Type /root/DoStaticKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/DoStaticKeyword.fs (2,7--2,8)
-                    WithKeyword = None })], /root/DoStaticKeyword.fs (2,0--3,16))],
-          PreXmlDocEmpty, [], None, /root/DoStaticKeyword.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs.bsl
deleted file mode 100644
index 4e6db64c116..00000000000
--- a/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs.bsl
+++ /dev/null
@@ -1,25 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/ElseKeywordInSimpleIfThenElse.fs", false,
-      QualifiedNameOfFile ElseKeywordInSimpleIfThenElse, [], [],
-      [SynModuleOrNamespace
-         ([ElseKeywordInSimpleIfThenElse], false, AnonModule,
-          [Expr
-             (IfThenElse
-                (Ident a, Ident b, Some (Ident c),
-                 Yes /root/ElseKeywordInSimpleIfThenElse.fs (2,0--2,9), false,
-                 /root/ElseKeywordInSimpleIfThenElse.fs (2,0--2,18),
-                 { IfKeyword = /root/ElseKeywordInSimpleIfThenElse.fs (2,0--2,2)
-                   IsElif = false
-                   ThenKeyword =
-                    /root/ElseKeywordInSimpleIfThenElse.fs (2,5--2,9)
-                   ElseKeyword =
-                    Some /root/ElseKeywordInSimpleIfThenElse.fs (2,12--2,16)
-                   IfToThenRange =
-                    /root/ElseKeywordInSimpleIfThenElse.fs (2,0--2,9) }),
-              /root/ElseKeywordInSimpleIfThenElse.fs (2,0--2,18))],
-          PreXmlDocEmpty, [], None,
-          /root/ElseKeywordInSimpleIfThenElse.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs b/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs
rename to tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs
diff --git a/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl b/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl
new file mode 100644
index 00000000000..d7b54132ac6
--- /dev/null
+++ b/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl
@@ -0,0 +1,56 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs", false,
+      QualifiedNameOfFile MultipleSynEnumCasesHaveBarRange, [], [],
+      [SynModuleOrNamespace
+         ([MultipleSynEnumCasesHaveBarRange], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (2,5--2,8)),
+                  Simple
+                    (Enum
+                       ([SynEnumCase
+                           ([], SynIdent (Bar, None),
+                            Const
+                              (Int32 1,
+                               /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (3,12--3,13)),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (3,6--3,13),
+                            { BarRange =
+                               Some
+                                 /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (3,4--3,5)
+                              EqualsRange =
+                               /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (3,10--3,11) });
+                         SynEnumCase
+                           ([], SynIdent (Bear, None),
+                            Const
+                              (Int32 2,
+                               /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (4,13--4,14)),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (4,6--4,14),
+                            { BarRange =
+                               Some
+                                 /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (4,4--4,5)
+                              EqualsRange =
+                               /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (4,11--4,12) })],
+                        /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (3,4--4,14)),
+                     /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (3,4--4,14)),
+                  [], None,
+                  /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (2,5--4,14),
+                  { LeadingKeyword =
+                     Type
+                       /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (2,9--2,10)
+                    WithKeyword = None })],
+              /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (2,0--4,14))],
+          PreXmlDocEmpty, [], None,
+          /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (2,0--5,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs
rename to tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs
diff --git a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl
new file mode 100644
index 00000000000..03263d25008
--- /dev/null
+++ b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl
@@ -0,0 +1,44 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/EnumCase/SingleSynEnumCaseHasBarRange.fs", false,
+      QualifiedNameOfFile SingleSynEnumCaseHasBarRange, [], [],
+      [SynModuleOrNamespace
+         ([SingleSynEnumCaseHasBarRange], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/EnumCase/SingleSynEnumCaseHasBarRange.fs (2,5--2,8)),
+                  Simple
+                    (Enum
+                       ([SynEnumCase
+                           ([], SynIdent (Bar, None),
+                            Const
+                              (Int32 1,
+                               /root/EnumCase/SingleSynEnumCaseHasBarRange.fs (2,19--2,20)),
+                            PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/EnumCase/SingleSynEnumCaseHasBarRange.fs (2,13--2,20),
+                            { BarRange =
+                               Some
+                                 /root/EnumCase/SingleSynEnumCaseHasBarRange.fs (2,11--2,12)
+                              EqualsRange =
+                               /root/EnumCase/SingleSynEnumCaseHasBarRange.fs (2,17--2,18) })],
+                        /root/EnumCase/SingleSynEnumCaseHasBarRange.fs (2,11--2,20)),
+                     /root/EnumCase/SingleSynEnumCaseHasBarRange.fs (2,11--2,20)),
+                  [], None,
+                  /root/EnumCase/SingleSynEnumCaseHasBarRange.fs (2,5--2,20),
+                  { LeadingKeyword =
+                     Type
+                       /root/EnumCase/SingleSynEnumCaseHasBarRange.fs (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/EnumCase/SingleSynEnumCaseHasBarRange.fs (2,9--2,10)
+                    WithKeyword = None })],
+              /root/EnumCase/SingleSynEnumCaseHasBarRange.fs (2,0--2,20))],
+          PreXmlDocEmpty, [], None,
+          /root/EnumCase/SingleSynEnumCaseHasBarRange.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs
rename to tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs
diff --git a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl
new file mode 100644
index 00000000000..fde5766870d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl
@@ -0,0 +1,42 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/EnumCase/SingleSynEnumCaseWithoutBar.fs", false,
+      QualifiedNameOfFile SingleSynEnumCaseWithoutBar, [], [],
+      [SynModuleOrNamespace
+         ([SingleSynEnumCaseWithoutBar], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/EnumCase/SingleSynEnumCaseWithoutBar.fs (2,5--2,8)),
+                  Simple
+                    (Enum
+                       ([SynEnumCase
+                           ([], SynIdent (Bar, None),
+                            Const
+                              (Int32 1,
+                               /root/EnumCase/SingleSynEnumCaseWithoutBar.fs (2,17--2,18)),
+                            PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/EnumCase/SingleSynEnumCaseWithoutBar.fs (2,11--2,18),
+                            { BarRange = None
+                              EqualsRange =
+                               /root/EnumCase/SingleSynEnumCaseWithoutBar.fs (2,15--2,16) })],
+                        /root/EnumCase/SingleSynEnumCaseWithoutBar.fs (2,11--2,18)),
+                     /root/EnumCase/SingleSynEnumCaseWithoutBar.fs (2,11--2,18)),
+                  [], None,
+                  /root/EnumCase/SingleSynEnumCaseWithoutBar.fs (2,5--2,18),
+                  { LeadingKeyword =
+                     Type
+                       /root/EnumCase/SingleSynEnumCaseWithoutBar.fs (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/EnumCase/SingleSynEnumCaseWithoutBar.fs (2,9--2,10)
+                    WithKeyword = None })],
+              /root/EnumCase/SingleSynEnumCaseWithoutBar.fs (2,0--2,18))],
+          PreXmlDocEmpty, [], None,
+          /root/EnumCase/SingleSynEnumCaseWithoutBar.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs
rename to tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
index ba2fb1d2b68..fcea76520ae 100644
--- a/tests/service/data/SyntaxTree/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs", false,
+     ("/root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs",
+      false,
       QualifiedNameOfFile SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword,
       [], [],
       [SynModuleOrNamespace
@@ -11,12 +12,12 @@ ImplFile
                    ([],
                     SynUnionCase
                       ([], SynIdent (Foo, None), Fields [], PreXmlDocEmpty, None,
-                       /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,10--4,13),
+                       /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,10--4,13),
                        { BarRange = None }), None,
                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                    /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,0--4,13)),
+                    /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,0--4,13)),
                  Some
-                   /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,14--4,18),
+                   /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,14--4,18),
                  [Member
                     (SynBinding
                        (None, Normal, false, false, [],
@@ -37,30 +38,30 @@ ImplFile
                              [Paren
                                 (Const
                                    (Unit,
-                                    /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,15--5,17)),
-                                 /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,15--5,17))],
+                                    /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,15--5,17)),
+                                 /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,15--5,17))],
                            None,
-                           /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,11--5,17)),
+                           /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,11--5,17)),
                         None,
                         Const
                           (Unit,
-                           /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,20--5,22)),
-                        /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,11--5,17),
+                           /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,20--5,22)),
+                        /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,11--5,17),
                         NoneAtInvisible,
                         { LeadingKeyword =
                            Member
-                             /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,4--5,10)
+                             /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,4--5,10)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,18--5,19) }),
-                     /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,4--5,22))],
-                 /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,0--5,22)),
-              /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,0--5,22))],
+                             /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,18--5,19) }),
+                     /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (5,4--5,22))],
+                 /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,0--5,22)),
+              /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (4,0--5,22))],
           PreXmlDocEmpty, [], None,
-          /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (2,0--5,22),
+          /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (2,0--5,22),
           { LeadingKeyword =
              Namespace
-               /root/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (2,0--2,9) })],
+               /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (2,0--2,9) })],
       (true, false), { ConditionalDirectives = []
                        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs b/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
rename to tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
diff --git a/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
similarity index 50%
rename from tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
rename to tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
index 9b0ddb7057c..97f5ec6c25d 100644
--- a/tests/service/data/SyntaxTree/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs",
+     ("/root/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs",
       false,
       QualifiedNameOfFile
         CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField, [],
@@ -13,21 +13,21 @@ ImplFile
                 (None,
                  Some
                    (Ident foo,
-                    (/root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,6--2,10),
+                    (/root/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,6--2,10),
                      None)),
                  [SynExprRecordField
                     ((SynLongIdent ([X], [], [None]), true),
                      Some
-                       /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,12--4,13),
+                       /root/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,12--4,13),
                      Some
                        (Const
                           (Int32 12,
-                           /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (5,16--5,18))),
+                           /root/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (5,16--5,18))),
                      None)],
-                 /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--5,20)),
-              /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--5,20))],
+                 /root/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--5,20)),
+              /root/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--5,20))],
           PreXmlDocEmpty, [], None,
-          /root/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--5,20),
+          /root/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--5,20),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs b/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs
rename to tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs
diff --git a/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs.bsl b/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl
similarity index 60%
rename from tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs.bsl
rename to tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl
index b1556be8c4c..fe98d151baf 100644
--- a/tests/service/data/SyntaxTree/GlobalKeywordAsSynExpr.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/GlobalKeywordAsSynExpr.fs", false,
+     ("/root/Expression/GlobalKeywordAsSynExpr.fs", false,
       QualifiedNameOfFile GlobalKeywordAsSynExpr, [], [],
       [SynModuleOrNamespace
          ([GlobalKeywordAsSynExpr], false, AnonModule,
@@ -9,9 +9,10 @@ ImplFile
                 (false,
                  SynLongIdent
                    ([`global`], [], [Some (OriginalNotation "global")]), None,
-                 /root/GlobalKeywordAsSynExpr.fs (2,0--2,6)),
-              /root/GlobalKeywordAsSynExpr.fs (2,0--2,6))], PreXmlDocEmpty, [],
-          None, /root/GlobalKeywordAsSynExpr.fs (2,0--2,6),
+                 /root/Expression/GlobalKeywordAsSynExpr.fs (2,0--2,6)),
+              /root/Expression/GlobalKeywordAsSynExpr.fs (2,0--2,6))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/GlobalKeywordAsSynExpr.fs (2,0--2,6),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs b/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
rename to tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
diff --git a/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
new file mode 100644
index 00000000000..2c0662ac35f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
@@ -0,0 +1,44 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs",
+      false,
+      QualifiedNameOfFile
+        InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField,
+      [], [],
+      [SynModuleOrNamespace
+         ([InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField],
+          false, AnonModule,
+          [Expr
+             (Record
+                (Some
+                   (LongIdent (SynLongIdent ([Exception], [], [None])),
+                    Paren
+                      (Ident msg,
+                       /root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,19--2,20),
+                       Some
+                         /root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,23--2,24),
+                       /root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,19--2,24)),
+                    /root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,10--2,24),
+                    Some
+                      (/root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,24--2,25),
+                       Some (2,25)),
+                    /root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,2--2,9)),
+                 None,
+                 [SynExprRecordField
+                    ((SynLongIdent ([X], [], [None]), true),
+                     Some
+                       /root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,28--2,29),
+                     Some
+                       (Const
+                          (Int32 1,
+                           /root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,30--2,31))),
+                     Some
+                       (/root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,31--2,32),
+                        Some (2,32)))],
+                 /root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--2,34)),
+              /root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--2,34))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--2,34),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs
rename to tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs
diff --git a/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
index 89450488be1..77bbcdb42ba 100644
--- a/tests/service/data/SyntaxTree/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs", false,
+     ("/root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs",
+      false,
       QualifiedNameOfFile NestedSynExprLetOrUseContainsTheRangeOfInKeyword, [],
       [],
       [SynModuleOrNamespace
@@ -18,10 +19,10 @@ ImplFile
                        [Paren
                           (Const
                              (Unit,
-                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,6--2,8)),
-                           /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,6--2,8))],
+                              /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,6--2,8)),
+                           /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,6--2,8))],
                      None,
-                     /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,8)),
+                     /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,8)),
                   None,
                   LetOrUse
                     (false, false,
@@ -33,21 +34,21 @@ ImplFile
                             None),
                          Named
                            (SynIdent (x, None), false, None,
-                            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,8--3,9)),
+                            /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,8--3,9)),
                          None,
                          Const
                            (Int32 1,
-                            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,12--3,13)),
-                         /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,8--3,9),
+                            /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,12--3,13)),
+                         /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,8--3,9),
                          Yes
-                           /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--3,13),
+                           /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--3,13),
                          { LeadingKeyword =
                             Let
-                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--3,7)
+                              /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--3,7)
                            InlineKeyword = None
                            EqualsRange =
                             Some
-                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,10--3,11) })],
+                              /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,10--3,11) })],
                      LetOrUse
                        (false, false,
                         [SynBinding
@@ -59,21 +60,21 @@ ImplFile
                                None),
                             Named
                               (SynIdent (y, None), false, None,
-                               /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,8--4,9)),
+                               /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,8--4,9)),
                             None,
                             Const
                               (Int32 2,
-                               /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,12--4,13)),
-                            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,8--4,9),
+                               /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,12--4,13)),
+                            /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,8--4,9),
                             Yes
-                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,4--4,13),
+                              /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,4--4,13),
                             { LeadingKeyword =
                                Let
-                                 /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,4--4,7)
+                                 /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,4--4,7)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,10--4,11) })],
+                                 /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,10--4,11) })],
                         App
                           (NonAtomic, false,
                            App
@@ -83,34 +84,34 @@ ImplFile
                                  SynLongIdent
                                    ([op_Addition], [],
                                     [Some (OriginalNotation "+")]), None,
-                                 /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (5,6--5,7)),
+                                 /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (5,6--5,7)),
                               Ident x,
-                              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (5,4--5,7)),
+                              /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (5,4--5,7)),
                            Ident y,
-                           /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (5,4--5,9)),
-                        /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,4--5,9),
+                           /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (5,4--5,9)),
+                        /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,4--5,9),
                         { InKeyword =
                            Some
-                             /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,14--4,16) }),
-                     /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--5,9),
+                             /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (4,14--4,16) }),
+                     /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,4--5,9),
                      { InKeyword =
                         Some
-                          /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,14--3,16) }),
-                  /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,8),
+                          /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,14--3,16) }),
+                  /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,8),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,3)
+                       /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,9--2,10) })],
-              /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--5,9))],
+                       /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,9--2,10) })],
+              /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--5,9))],
           PreXmlDocEmpty, [], None,
-          /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--6,0),
+          /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,17--3,55)] },
+            /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,17--3,55)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl
new file mode 100644
index 00000000000..63477388d71
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl
@@ -0,0 +1,28 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/SynExprAnonRecdWithStructKeyword.fs", false,
+      QualifiedNameOfFile SynExprAnonRecdWithStructKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynExprAnonRecdWithStructKeyword], false, AnonModule,
+          [Expr
+             (AnonRecd
+                (true, None,
+                 [(Foo,
+                   Some
+                     /root/Expression/SynExprAnonRecdWithStructKeyword.fs (3,11--3,12),
+                   Ident someValue)],
+                 /root/Expression/SynExprAnonRecdWithStructKeyword.fs (2,0--5,16)),
+              /root/Expression/SynExprAnonRecdWithStructKeyword.fs (2,0--5,16));
+           Expr
+             (AnonRecd
+                (true, None, [],
+                 /root/Expression/SynExprAnonRecdWithStructKeyword.fs (7,0--7,12)),
+              /root/Expression/SynExprAnonRecdWithStructKeyword.fs (7,0--7,12))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprAnonRecdWithStructKeyword.fs (2,0--7,12),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/Expression/SynExprAnonRecdWithStructKeyword.fs (4,4--4,11)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
new file mode 100644
index 00000000000..ab0d9eb8667
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
@@ -0,0 +1,37 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs",
+      false,
+      QualifiedNameOfFile
+        SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields, [], [],
+      [SynModuleOrNamespace
+         ([SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields], false,
+          AnonModule,
+          [Expr
+             (AnonRecd
+                (false, None,
+                 [(X,
+                   Some
+                     /root/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,5--2,6),
+                   Const
+                     (Int32 5,
+                      /root/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,7--2,8)));
+                  (Y,
+                   Some
+                     /root/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (3,8--3,9),
+                   Const
+                     (Int32 6,
+                      /root/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (3,10--3,11)));
+                  (Z,
+                   Some
+                     /root/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (4,12--4,13),
+                   Const
+                     (Int32 7,
+                      /root/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (4,14--4,15)))],
+                 /root/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,0--4,18)),
+              /root/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,0--4,18))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,0--4,18),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs b/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
similarity index 55%
rename from tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
index dd2811dd41d..79e064c3651 100644
--- a/tests/service/data/SyntaxTree/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynExprDoContainsTheRangeOfTheDoKeyword.fs", false,
+     ("/root/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs", false,
       QualifiedNameOfFile SynExprDoContainsTheRangeOfTheDoKeyword, [], [],
       [SynModuleOrNamespace
          ([SynExprDoContainsTheRangeOfTheDoKeyword], false, AnonModule,
@@ -13,29 +13,29 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (a, None), false, None,
-                     /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,4--2,5)),
+                     /root/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,4--2,5)),
                   None,
                   Sequential
                     (SuppressNeither, true,
                      Do
                        (Ident foobar,
-                        /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (3,4--4,14)),
+                        /root/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs (3,4--4,14)),
                      DoBang
                        (Ident foobarBang,
-                        /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (5,4--6,18)),
-                     /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (3,4--6,18)),
-                  /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,4--2,5),
+                        /root/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs (5,4--6,18)),
+                     /root/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs (3,4--6,18)),
+                  /root/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,4--2,5),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,0--2,3)
+                       /root/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,6--2,7) })],
-              /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,0--6,18))],
+                       /root/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,6--2,7) })],
+              /root/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,0--6,18))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,0--7,0),
+          /root/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl
new file mode 100644
index 00000000000..228c475a5bd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl
@@ -0,0 +1,18 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/SynExprDynamicDoesContainIdent.fs", false,
+      QualifiedNameOfFile SynExprDynamicDoesContainIdent, [], [],
+      [SynModuleOrNamespace
+         ([SynExprDynamicDoesContainIdent], false, AnonModule,
+          [Expr
+             (Dynamic
+                (Ident x,
+                 /root/Expression/SynExprDynamicDoesContainIdent.fs (2,1--2,2),
+                 Ident k,
+                 /root/Expression/SynExprDynamicDoesContainIdent.fs (2,0--2,3)),
+              /root/Expression/SynExprDynamicDoesContainIdent.fs (2,0--2,3))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprDynamicDoesContainIdent.fs (2,0--2,3),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl
new file mode 100644
index 00000000000..0203b86c81e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl
@@ -0,0 +1,23 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/SynExprDynamicDoesContainParentheses.fs", false,
+      QualifiedNameOfFile SynExprDynamicDoesContainParentheses, [], [],
+      [SynModuleOrNamespace
+         ([SynExprDynamicDoesContainParentheses], false, AnonModule,
+          [Expr
+             (Dynamic
+                (Ident x,
+                 /root/Expression/SynExprDynamicDoesContainParentheses.fs (2,1--2,2),
+                 Paren
+                   (Ident g,
+                    /root/Expression/SynExprDynamicDoesContainParentheses.fs (2,2--2,3),
+                    Some
+                      /root/Expression/SynExprDynamicDoesContainParentheses.fs (2,4--2,5),
+                    /root/Expression/SynExprDynamicDoesContainParentheses.fs (2,2--2,5)),
+                 /root/Expression/SynExprDynamicDoesContainParentheses.fs (2,0--2,5)),
+              /root/Expression/SynExprDynamicDoesContainParentheses.fs (2,0--2,5))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprDynamicDoesContainParentheses.fs (2,0--2,5),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..0a934bba6f4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,41 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs", false,
+      QualifiedNameOfFile SynExprForContainsTheRangeOfTheEqualsSign, [], [],
+      [SynModuleOrNamespace
+         ([SynExprForContainsTheRangeOfTheEqualsSign], false, AnonModule,
+          [Expr
+             (For
+                (Yes
+                   /root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--2,3),
+                 Yes
+                   /root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,10--2,12),
+                 i,
+                 Some
+                   /root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,6--2,7),
+                 Const
+                   (Int32 1,
+                    /root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,8--2,9)),
+                 true,
+                 Const
+                   (Int32 10,
+                    /root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,13--2,15)),
+                 App
+                   (NonAtomic, false,
+                    App
+                      (NonAtomic, false, Ident printf,
+                       Const
+                         (String
+                            ("%d ", Regular,
+                             /root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs (3,7--3,12)),
+                          /root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs (3,7--3,12)),
+                       /root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs (3,0--3,12)),
+                    Ident i,
+                    /root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs (3,0--3,14)),
+                 /root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--3,14)),
+              /root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--3,14))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..0af7a738c7f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,57 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs",
+      false,
+      QualifiedNameOfFile SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign, [],
+      [],
+      [SynModuleOrNamespace
+         ([SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign], false,
+          AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false, Ident comp,
+                 ComputationExpr
+                   (false,
+                    LetOrUseBang
+                      (Yes
+                         /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,4--3,14),
+                       false, true,
+                       Named
+                         (SynIdent (x, None), false, None,
+                          /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,9--3,10)),
+                       Ident y,
+                       [SynExprAndBang
+                          (Yes
+                             /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,4--5,10),
+                           false, true,
+                           Named
+                             (SynIdent (z, None), false, None,
+                              /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,9--4,10)),
+                           App
+                             (NonAtomic, false, Ident someFunction,
+                              Const
+                                (Unit,
+                                 /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,26--4,28)),
+                              /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,13--4,28)),
+                           /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,4--4,28),
+                           { EqualsRange =
+                              /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,11--4,12)
+                             InKeyword = None })],
+                       YieldOrReturn
+                         ((false, true),
+                          Const
+                            (Unit,
+                             /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (5,11--5,13)),
+                          /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (5,4--5,13)),
+                       /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,4--5,13),
+                       { EqualsRange =
+                          Some
+                            /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,11--3,12) }),
+                    /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,5--6,1)),
+                 /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,0--6,1)),
+              /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,0--6,1))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,0--6,1),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
similarity index 51%
rename from tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
index 09edc090f7c..6285a4bc737 100644
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs", false,
+     ("/root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs", false,
       QualifiedNameOfFile SynExprLetOrUseContainsTheRangeOfInKeyword, [], [],
       [SynModuleOrNamespace
          ([SynExprLetOrUseContainsTheRangeOfInKeyword], false, AnonModule,
@@ -15,31 +15,31 @@ ImplFile
                         None),
                      Named
                        (SynIdent (x, None), false, None,
-                        /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,5)),
+                        /root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,5)),
                      None,
                      Const
                        (Int32 1,
-                        /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,8--2,9)),
-                     /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,5),
+                        /root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,8--2,9)),
+                     /root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,4--2,5),
                      Yes
-                       /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,9),
+                       /root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,9),
                      { LeadingKeyword =
                         Let
-                          /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,3)
+                          /root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,3)
                        InlineKeyword = None
                        EqualsRange =
                         Some
-                          /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,6--2,7) })],
+                          /root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,6--2,7) })],
                  Const
                    (Unit,
-                    /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,13--2,15)),
-                 /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,15),
+                    /root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,13--2,15)),
+                 /root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,15),
                  { InKeyword =
                     Some
-                      /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,10--2,12) }),
-              /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,15))],
+                      /root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,10--2,12) }),
+              /root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,15))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,15),
+          /root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,15),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
similarity index 51%
rename from tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
index ffb5bbdf0ee..75f83ca1682 100644
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs", false,
+     ("/root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs",
+      false,
       QualifiedNameOfFile SynExprLetOrUseDoesNotContainTheRangeOfInKeyword, [],
       [],
       [SynModuleOrNamespace
@@ -17,30 +18,30 @@ ImplFile
                            None),
                         Named
                           (SynIdent (x, None), false, None,
-                           /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,4--3,5)),
+                           /root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,4--3,5)),
                         None,
                         Const
                           (Int32 1,
-                           /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,8--3,9)),
-                        /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,4--3,5),
+                           /root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,8--3,9)),
+                        /root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,4--3,5),
                         Yes
-                          /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,0--3,9),
+                          /root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,0--3,9),
                         { LeadingKeyword =
                            Let
-                             /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,0--3,3)
+                             /root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,0--3,3)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,6--3,7) })],
+                             /root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,6--3,7) })],
                     Const
                       (Unit,
-                       /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (4,0--4,2)),
-                    /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,0--4,2),
+                       /root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (4,0--4,2)),
+                    /root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (3,0--4,2),
                     { InKeyword = None }),
-                 /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--4,2)),
-              /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--4,2))],
+                 /root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--4,2)),
+              /root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--4,2))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--5,0),
+          /root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
new file mode 100644
index 00000000000..2139338a1f4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
@@ -0,0 +1,69 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword],
+          false, AnonModule,
+          [Expr
+             (Do
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (e1, None), false, None,
+                           /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,4--3,6)),
+                        None,
+                        Downcast
+                          (Ident e,
+                           LongIdent
+                             (SynLongIdent
+                                ([Collections; DictionaryEntry],
+                                 [/root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,26--3,27)],
+                                 [None; None])),
+                           /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,9--3,42)),
+                        /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,4--3,6),
+                        Yes
+                          /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,0--3,42),
+                        { LeadingKeyword =
+                           Let
+                             /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,0--3,3)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,7--3,8) })],
+                    Tuple
+                      (false,
+                       [LongIdent
+                          (false,
+                           SynLongIdent
+                             ([e1; Key],
+                              [/root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,2--4,3)],
+                              [None; None]), None,
+                           /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,0--4,6));
+                        LongIdent
+                          (false,
+                           SynLongIdent
+                             ([e1; Value],
+                              [/root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,10--4,11)],
+                              [None; None]), None,
+                           /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,8--4,16))],
+                       [/root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,6--4,7)],
+                       /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,0--4,16)),
+                    /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,0--4,16),
+                    { InKeyword = None }),
+                 /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--4,16)),
+              /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--4,16))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--5,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
new file mode 100644
index 00000000000..8a3838a7383
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
@@ -0,0 +1,74 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword],
+          false, AnonModule,
+          [Expr
+             (Do
+                (LetOrUse
+                   (true, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (f, None), false, None,
+                           /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,12--3,13)),
+                        None,
+                        Const
+                          (Unit,
+                           /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,16--3,18)),
+                        /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,12--3,13),
+                        Yes
+                          /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,4--3,18),
+                        { LeadingKeyword =
+                           LetRec
+                             (/root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,4--3,7),
+                              /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,8--3,11))
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,14--3,15) });
+                     SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((4,8), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (g, None), false, None,
+                           /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,8--4,9)),
+                        None,
+                        Const
+                          (Unit,
+                           /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,12--4,14)),
+                        /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,8--4,9),
+                        Yes
+                          /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,4--4,14),
+                        { LeadingKeyword =
+                           And
+                             /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,4--4,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,10--4,11) })],
+                    Const
+                      (Unit,
+                       /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (5,4--5,6)),
+                    /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,4--5,6),
+                    { InKeyword =
+                       Some
+                         /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,15--4,17) }),
+                 /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,0--5,6)),
+              /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,0--5,6))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,0--6,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs b/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
new file mode 100644
index 00000000000..a43571c0236
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
@@ -0,0 +1,38 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword], false,
+          AnonModule,
+          [Expr
+             (MatchBang
+                (Yes
+                   /root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,13),
+                 Ident x,
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (y, None), false, None,
+                        /root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (3,2--3,3)),
+                     None, Ident z,
+                     /root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (3,2--3,8),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (3,4--3,6)
+                       BarRange =
+                        Some
+                          /root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (3,0--3,1) })],
+                 /root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--3,8),
+                 { MatchBangKeyword =
+                    /root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,6)
+                   WithKeyword =
+                    /root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,9--2,13) }),
+              /root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--3,8))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs b/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
new file mode 100644
index 00000000000..67766a838a7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
@@ -0,0 +1,38 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs",
+      false,
+      QualifiedNameOfFile SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword], false,
+          AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,12),
+                 Ident x,
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (y, None), false, None,
+                        /root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (3,2--3,3)),
+                     None, Ident z,
+                     /root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (3,2--3,8),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (3,4--3,6)
+                       BarRange =
+                        Some
+                          /root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (3,0--3,1) })],
+                 /root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--3,8),
+                 { MatchKeyword =
+                    /root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,5)
+                   WithKeyword =
+                    /root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,8--2,12) }),
+              /root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--3,8))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs b/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
index 3d2519920f0..620a36d52e0 100644
--- a/tests/service/data/SyntaxTree/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynExprObjExprContainsTheRangeOfWithKeyword.fs", false,
+     ("/root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs", false,
       QualifiedNameOfFile SynExprObjExprContainsTheRangeOfWithKeyword, [], [],
       [SynModuleOrNamespace
          ([SynExprObjExprContainsTheRangeOfWithKeyword], false, AnonModule,
@@ -10,10 +10,10 @@ ImplFile
                  Some
                    (Const
                       (Unit,
-                       /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,9--2,11)),
+                       /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,9--2,11)),
                     None),
                  Some
-                   /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,12--2,16),
+                   /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,12--2,16),
                  [],
                  [Member
                     (SynBinding
@@ -32,63 +32,63 @@ ImplFile
                         LongIdent
                           (SynLongIdent
                              ([x; ToString],
-                              [/root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,12--3,13)],
+                              [/root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,12--3,13)],
                               [None; None]), None, None,
                            Pats
                              [Paren
                                 (Const
                                    (Unit,
-                                    /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,21--3,23)),
-                                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,21--3,23))],
+                                    /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,21--3,23)),
+                                 /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,21--3,23))],
                            None,
-                           /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,11--3,23)),
+                           /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,11--3,23)),
                         None,
                         Const
                           (String
                              ("INotifyEnumerableInternal", Regular,
-                              /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,26--3,53)),
-                           /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,26--3,53)),
-                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,11--3,23),
+                              /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,26--3,53)),
+                           /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,26--3,53)),
+                        /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,11--3,23),
                         NoneAtInvisible,
                         { LeadingKeyword =
                            Member
-                             /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,4--3,10)
+                             /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,4--3,10)
                           InlineKeyword = None
                           EqualsRange =
                            Some
-                             /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,24--3,25) }),
-                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,4--3,53))],
+                             /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,24--3,25) }),
+                     /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (3,4--3,53))],
                  [SynInterfaceImpl
                     (App
                        (LongIdent
                           (SynLongIdent
                              ([INotifyEnumerableInternal], [], [None])),
                         Some
-                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,37--4,38),
+                          /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,37--4,38),
                         [Var
                            (SynTypar (T, None, false),
-                            /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,38--4,40))],
+                            /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,38--4,40))],
                         [],
                         Some
-                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,40--4,41),
+                          /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,40--4,41),
                         false,
-                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,12--4,41)),
+                        /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,12--4,41)),
                      None, [], [],
-                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,2--5,2));
+                     /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (4,2--5,2));
                   SynInterfaceImpl
                     (App
                        (LongIdent (SynLongIdent ([IEnumerable], [], [None])),
                         Some
-                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,23--5,24),
+                          /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,23--5,24),
                         [Anon
-                           /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,24--5,25)],
+                           /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,24--5,25)],
                         [],
                         Some
-                          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,25--5,26),
+                          /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,25--5,26),
                         false,
-                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,12--5,26)),
+                        /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,12--5,26)),
                      Some
-                       /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,27--5,31),
+                       /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,27--5,31),
                      [],
                      [Member
                         (SynBinding
@@ -107,35 +107,35 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([x; GetEnumerator],
-                                  [/root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,12--6,13)],
+                                  [/root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,12--6,13)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,26--6,28)),
-                                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,26--6,28))],
+                                        /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,26--6,28)),
+                                     /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,26--6,28))],
                                None,
-                               /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,11--6,28)),
+                               /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,11--6,28)),
                             None,
                             Null
-                              /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,31--6,35),
-                            /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,11--6,28),
+                              /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,31--6,35),
+                            /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,11--6,28),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,4--6,10)
+                                 /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,4--6,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,29--6,30) }),
-                         /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,4--6,35))],
-                     /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,2--6,37))],
-                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,2--2,11),
-                 /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,0--6,37)),
-              /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,0--6,37))],
+                                 /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,29--6,30) }),
+                         /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (6,4--6,35))],
+                     /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (5,2--6,37))],
+                 /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,2--2,11),
+                 /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,0--6,37)),
+              /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,0--6,37))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,0--6,37),
+          /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,0--6,37),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs b/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprObjWithSetter.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs
diff --git a/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl
similarity index 56%
rename from tests/service/data/SyntaxTree/SynExprObjWithSetter.fs.bsl
rename to tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl
index e0a60c0c8ec..44b73797995 100644
--- a/tests/service/data/SyntaxTree/SynExprObjWithSetter.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynExprObjWithSetter.fs", false,
+     ("/root/Expression/SynExprObjWithSetter.fs", false,
       QualifiedNameOfFile SynExprObjWithSetter, [], [],
       [SynModuleOrNamespace
          ([SynExprObjWithSetter], false, AnonModule,
@@ -12,22 +12,28 @@ ImplFile
                              SynLongIdent ([AbstractClass], [], [None])
                             ArgExpr =
                              Const
-                               (Unit, /root/SynExprObjWithSetter.fs (2,2--2,15))
+                               (Unit,
+                                /root/Expression/SynExprObjWithSetter.fs (2,2--2,15))
                             Target = None
                             AppliesToGetterAndSetter = false
-                            Range = /root/SynExprObjWithSetter.fs (2,2--2,15) }]
-                        Range = /root/SynExprObjWithSetter.fs (2,0--2,17) }],
+                            Range =
+                             /root/Expression/SynExprObjWithSetter.fs (2,2--2,15) }]
+                        Range =
+                         /root/Expression/SynExprObjWithSetter.fs (2,0--2,17) }],
                      None, [], [CFoo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/SynExprObjWithSetter.fs (3,5--3,9)),
+                     false, None,
+                     /root/Expression/SynExprObjWithSetter.fs (3,5--3,9)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
-                           ([], /root/SynExprObjWithSetter.fs (3,9--3,11)), None,
+                           ([],
+                            /root/Expression/SynExprObjWithSetter.fs (3,9--3,11)),
+                         None,
                          PreXmlDoc ((3,9), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynExprObjWithSetter.fs (3,5--3,9),
+                         /root/Expression/SynExprObjWithSetter.fs (3,5--3,9),
                          { AsKeyword = None });
                       AbstractSlot
                         (SynValSig
@@ -38,13 +44,14 @@ ImplFile
                             false,
                             PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynExprObjWithSetter.fs (4,4--4,54),
+                            /root/Expression/SynExprObjWithSetter.fs (4,4--4,54),
                             { LeadingKeyword =
                                Abstract
-                                 /root/SynExprObjWithSetter.fs (4,4--4,12)
+                                 /root/Expression/SynExprObjWithSetter.fs (4,4--4,12)
                               InlineKeyword = None
                               WithKeyword =
-                               Some /root/SynExprObjWithSetter.fs (4,46--4,50)
+                               Some
+                                 /root/Expression/SynExprObjWithSetter.fs (4,46--4,50)
                               EqualsRange = None }),
                          { IsInstance = true
                            IsDispatchSlot = true
@@ -52,32 +59,38 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         /root/SynExprObjWithSetter.fs (4,4--4,54),
+                         /root/Expression/SynExprObjWithSetter.fs (4,4--4,54),
                          { GetSetKeywords =
                             Some
-                              (Set /root/SynExprObjWithSetter.fs (4,51--4,54)) })],
-                     /root/SynExprObjWithSetter.fs (4,4--4,54)), [],
+                              (Set
+                                 /root/Expression/SynExprObjWithSetter.fs (4,51--4,54)) })],
+                     /root/Expression/SynExprObjWithSetter.fs (4,4--4,54)), [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
-                          ([], /root/SynExprObjWithSetter.fs (3,9--3,11)), None,
+                          ([],
+                           /root/Expression/SynExprObjWithSetter.fs (3,9--3,11)),
+                        None,
                         PreXmlDoc ((3,9), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynExprObjWithSetter.fs (3,5--3,9),
+                        /root/Expression/SynExprObjWithSetter.fs (3,5--3,9),
                         { AsKeyword = None })),
-                  /root/SynExprObjWithSetter.fs (2,0--4,54),
+                  /root/Expression/SynExprObjWithSetter.fs (2,0--4,54),
                   { LeadingKeyword =
-                     Type /root/SynExprObjWithSetter.fs (3,0--3,4)
+                     Type /root/Expression/SynExprObjWithSetter.fs (3,0--3,4)
                     EqualsRange =
-                     Some /root/SynExprObjWithSetter.fs (3,12--3,13)
+                     Some /root/Expression/SynExprObjWithSetter.fs (3,12--3,13)
                     WithKeyword = None })],
-              /root/SynExprObjWithSetter.fs (2,0--4,54));
+              /root/Expression/SynExprObjWithSetter.fs (2,0--4,54));
            Expr
              (ObjExpr
                 (LongIdent (SynLongIdent ([CFoo], [], [None])),
                  Some
-                   (Const (Unit, /root/SynExprObjWithSetter.fs (6,10--6,12)),
-                    None), Some /root/SynExprObjWithSetter.fs (6,13--6,17), [],
+                   (Const
+                      (Unit,
+                       /root/Expression/SynExprObjWithSetter.fs (6,10--6,12)),
+                    None),
+                 Some /root/Expression/SynExprObjWithSetter.fs (6,13--6,17), [],
                  [GetSetMember
                     (None,
                      Some
@@ -99,40 +112,47 @@ ImplFile
                            LongIdent
                              (SynLongIdent
                                 ([this; AbstractClassPropertySet],
-                                 [/root/SynExprObjWithSetter.fs (7,17--7,18)],
+                                 [/root/Expression/SynExprObjWithSetter.fs (7,17--7,18)],
                                  [None; None]), Some set, None,
                               Pats
                                 [Paren
                                    (Typed
                                       (Named
                                          (SynIdent (v, None), false, None,
-                                          /root/SynExprObjWithSetter.fs (7,53--7,54)),
+                                          /root/Expression/SynExprObjWithSetter.fs (7,53--7,54)),
                                        LongIdent
                                          (SynLongIdent ([string], [], [None])),
-                                       /root/SynExprObjWithSetter.fs (7,53--7,61)),
-                                    /root/SynExprObjWithSetter.fs (7,52--7,62))],
-                              None, /root/SynExprObjWithSetter.fs (7,48--7,62)),
+                                       /root/Expression/SynExprObjWithSetter.fs (7,53--7,61)),
+                                    /root/Expression/SynExprObjWithSetter.fs (7,52--7,62))],
+                              None,
+                              /root/Expression/SynExprObjWithSetter.fs (7,48--7,62)),
                            None,
                            Const
-                             (Unit, /root/SynExprObjWithSetter.fs (7,65--7,67)),
-                           /root/SynExprObjWithSetter.fs (7,48--7,62),
+                             (Unit,
+                              /root/Expression/SynExprObjWithSetter.fs (7,65--7,67)),
+                           /root/Expression/SynExprObjWithSetter.fs (7,48--7,62),
                            NoneAtInvisible,
                            { LeadingKeyword =
-                              Override /root/SynExprObjWithSetter.fs (7,4--7,12)
+                              Override
+                                /root/Expression/SynExprObjWithSetter.fs (7,4--7,12)
                              InlineKeyword = None
                              EqualsRange =
-                              Some /root/SynExprObjWithSetter.fs (7,63--7,64) })),
-                     /root/SynExprObjWithSetter.fs (7,4--7,67),
+                              Some
+                                /root/Expression/SynExprObjWithSetter.fs (7,63--7,64) })),
+                     /root/Expression/SynExprObjWithSetter.fs (7,4--7,67),
                      { InlineKeyword = None
-                       WithKeyword = /root/SynExprObjWithSetter.fs (7,43--7,47)
+                       WithKeyword =
+                        /root/Expression/SynExprObjWithSetter.fs (7,43--7,47)
                        GetKeyword = None
                        AndKeyword = None
                        SetKeyword =
-                        Some /root/SynExprObjWithSetter.fs (7,48--7,51) })], [],
-                 /root/SynExprObjWithSetter.fs (6,2--6,12),
-                 /root/SynExprObjWithSetter.fs (6,0--7,69)),
-              /root/SynExprObjWithSetter.fs (6,0--7,69))], PreXmlDocEmpty, [],
-          None, /root/SynExprObjWithSetter.fs (2,0--7,69),
+                        Some
+                          /root/Expression/SynExprObjWithSetter.fs (7,48--7,51) })],
+                 [], /root/Expression/SynExprObjWithSetter.fs (6,2--6,12),
+                 /root/Expression/SynExprObjWithSetter.fs (6,0--7,69)),
+              /root/Expression/SynExprObjWithSetter.fs (6,0--7,69))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprObjWithSetter.fs (2,0--7,69),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs b/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs
diff --git a/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
similarity index 50%
rename from tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
rename to tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
index e9c6d735540..4e0ed8b11b2 100644
--- a/tests/service/data/SyntaxTree/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs",
+     ("/root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs",
       false,
       QualifiedNameOfFile
         SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField, [], [],
@@ -13,15 +13,15 @@ ImplFile
                  [SynExprRecordField
                     ((SynLongIdent ([V], [], [None]), true),
                      Some
-                       /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,4--2,5),
+                       /root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,4--2,5),
                      Some (Ident v),
                      Some
-                       (/root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,8--3,2),
+                       (/root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,8--3,2),
                         None));
                   SynExprRecordField
                     ((SynLongIdent ([X], [], [None]), true),
                      Some
-                       /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,9--3,10),
+                       /root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,9--3,10),
                      Some
                        (App
                           (NonAtomic, false,
@@ -30,19 +30,19 @@ ImplFile
                               App
                                 (NonAtomic, false, Ident someLongFunctionCall,
                                  Ident a,
-                                 /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,16--5,21)),
+                                 /root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,16--5,21)),
                               Ident b,
-                              /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,16--6,21)),
+                              /root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,16--6,21)),
                            Ident c,
-                           /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,16--7,21))),
+                           /root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (4,16--7,21))),
                      None)],
-                 /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--7,23)),
-              /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--7,23))],
+                 /root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--7,23)),
+              /root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--7,23))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--7,23),
+          /root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--7,23),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,13--3,28)] },
+            /root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,13--3,28)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs b/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs
diff --git a/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
rename to tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
index e87174a4554..681f8296cf8 100644
--- a/tests/service/data/SyntaxTree/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
@@ -1,8 +1,8 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs", false,
-      QualifiedNameOfFile SynExprRecordFieldsContainCorrectAmountOfTrivia, [],
-      [],
+     ("/root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs",
+      false, QualifiedNameOfFile SynExprRecordFieldsContainCorrectAmountOfTrivia,
+      [], [],
       [SynModuleOrNamespace
          ([SynExprRecordFieldsContainCorrectAmountOfTrivia], false, AnonModule,
           [Expr
@@ -11,7 +11,7 @@ ImplFile
                  [SynExprRecordField
                     ((SynLongIdent ([JobType], [], [None]), true),
                      Some
-                       /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,10--2,11),
+                       /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,10--2,11),
                      Some
                        (App
                           (NonAtomic, false,
@@ -22,7 +22,7 @@ ImplFile
                                  SynLongIdent
                                    ([op_Equality], [],
                                     [Some (OriginalNotation "=")]), None,
-                                 /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (5,13--5,14)),
+                                 /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (5,13--5,14)),
                               App
                                 (NonAtomic, false,
                                  App
@@ -32,7 +32,7 @@ ImplFile
                                        SynLongIdent
                                          ([op_Equality], [],
                                           [Some (OriginalNotation "=")]), None,
-                                       /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (4,12--4,13)),
+                                       /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (4,12--4,13)),
                                     App
                                       (NonAtomic, false,
                                        App
@@ -43,37 +43,37 @@ ImplFile
                                                ([op_Equality], [],
                                                 [Some (OriginalNotation "=")]),
                                              None,
-                                             /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (3,19--3,20)),
+                                             /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (3,19--3,20)),
                                           App
                                             (NonAtomic, false,
                                              Ident EsriBoundaryImport,
                                              Ident FileToImport,
-                                             /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--3,18)),
-                                          /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--3,20)),
+                                             /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--3,18)),
+                                          /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--3,20)),
                                        App
                                          (NonAtomic, false, Ident filePath,
                                           Ident State,
-                                          /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (3,21--4,11)),
-                                       /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--4,11)),
-                                    /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--4,13)),
+                                          /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (3,21--4,11)),
+                                       /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--4,11)),
+                                    /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--4,13)),
                                  App
                                    (NonAtomic, false, Ident state, Ident DryRun,
-                                    /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (4,14--5,12)),
-                                 /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--5,12)),
-                              /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--5,14)),
+                                    /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (4,14--5,12)),
+                                 /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--5,12)),
+                              /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--5,14)),
                            LongIdent
                              (false,
                               SynLongIdent
                                 ([args; DryRun],
-                                 [/root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (5,19--5,20)],
+                                 [/root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (5,19--5,20)],
                                  [None; None]), None,
-                              /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (5,15--5,26)),
-                           /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--5,26))),
+                              /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (5,15--5,26)),
+                           /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,12--5,26))),
                      None)],
-                 /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,0--5,28)),
-              /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,0--5,28))],
+                 /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,0--5,28)),
+              /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,0--5,28))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,0--5,28),
+          /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,0--5,28),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs b/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl
new file mode 100644
index 00000000000..76c92c96b8a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl
@@ -0,0 +1,23 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/SynExprSetWithSynExprDynamic.fs", false,
+      QualifiedNameOfFile SynExprSetWithSynExprDynamic, [], [],
+      [SynModuleOrNamespace
+         ([SynExprSetWithSynExprDynamic], false, AnonModule,
+          [Expr
+             (Set
+                (Dynamic
+                   (Ident x,
+                    /root/Expression/SynExprSetWithSynExprDynamic.fs (2,1--2,2),
+                    Ident v,
+                    /root/Expression/SynExprSetWithSynExprDynamic.fs (2,0--2,3)),
+                 Const
+                   (Int32 2,
+                    /root/Expression/SynExprSetWithSynExprDynamic.fs (2,7--2,8)),
+                 /root/Expression/SynExprSetWithSynExprDynamic.fs (2,0--2,8)),
+              /root/Expression/SynExprSetWithSynExprDynamic.fs (2,0--2,8))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprSetWithSynExprDynamic.fs (2,0--2,8),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs b/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
new file mode 100644
index 00000000000..6b178749bef
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
@@ -0,0 +1,30 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword], false,
+          AnonModule,
+          [Expr
+             (TryFinally
+                (Ident x,
+                 Const
+                   (Unit,
+                    /root/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (5,0--5,2)),
+                 /root/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--5,2),
+                 Yes
+                   /root/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--2,3),
+                 Yes
+                   /root/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,7),
+                 { TryKeyword =
+                    /root/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--2,3)
+                   FinallyKeyword =
+                    /root/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,7) }),
+              /root/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--5,2))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--6,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs b/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs
rename to tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
new file mode 100644
index 00000000000..e4d29975a85
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
@@ -0,0 +1,44 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs",
+      false,
+      QualifiedNameOfFile SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword], false,
+          AnonModule,
+          [Expr
+             (TryWith
+                (Ident x,
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (5,2--5,4)),
+                     None, Ident y,
+                     /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (5,2--5,9),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (5,5--5,7)
+                       BarRange =
+                        Some
+                          /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (5,0--5,1) })],
+                 /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--5,9),
+                 Yes
+                   /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--2,3),
+                 Yes
+                   /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,4),
+                 { TryKeyword =
+                    /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--2,3)
+                   TryToWithRange =
+                    /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--4,4)
+                   WithKeyword =
+                    /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,4)
+                   WithToEndRange =
+                    /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--5,9) }),
+              /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--5,9))],
+          PreXmlDocEmpty, [], None,
+          /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--6,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs b/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs
rename to tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs
diff --git a/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs.bsl b/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl
similarity index 60%
rename from tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs.bsl
rename to tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl
index dd36a40d49b..a76c9aeb358 100644
--- a/tests/service/data/SyntaxTree/ExternKeywordIsPresentInTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/ExternKeywordIsPresentInTrivia.fs", false,
+     ("/root/Extern/ExternKeywordIsPresentInTrivia.fs", false,
       QualifiedNameOfFile ExternKeywordIsPresentInTrivia, [], [],
       [SynModuleOrNamespace
          ([ExternKeywordIsPresentInTrivia], false, AnonModule,
@@ -17,8 +17,9 @@ ImplFile
                      Pats
                        [Tuple
                           (false, [],
-                           /root/ExternKeywordIsPresentInTrivia.fs (2,26--2,27))],
-                     None, /root/ExternKeywordIsPresentInTrivia.fs (2,12--2,26)),
+                           /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,26--2,27))],
+                     None,
+                     /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,12--2,26)),
                   Some
                     (SynBindingReturnInfo
                        (App
@@ -26,9 +27,9 @@ ImplFile
                              (SynLongIdent
                                 ([unit], [], [Some (OriginalNotation "void")])),
                            None, [], [], None, false,
-                           /root/ExternKeywordIsPresentInTrivia.fs (2,7--2,11)),
-                        /root/ExternKeywordIsPresentInTrivia.fs (2,7--2,11), [],
-                        { ColonRange = None })),
+                           /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,7--2,11)),
+                        /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,7--2,11),
+                        [], { ColonRange = None })),
                   Typed
                     (App
                        (NonAtomic, false, Ident failwith,
@@ -36,25 +37,26 @@ ImplFile
                           (String
                              ("extern was not given a DllImport attribute",
                               Regular,
-                              /root/ExternKeywordIsPresentInTrivia.fs (2,27--2,28)),
-                           /root/ExternKeywordIsPresentInTrivia.fs (2,27--2,28)),
-                        /root/ExternKeywordIsPresentInTrivia.fs (2,0--2,28)),
+                              /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,27--2,28)),
+                           /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,27--2,28)),
+                        /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,0--2,28)),
                      App
                        (LongIdent
                           (SynLongIdent
                              ([unit], [], [Some (OriginalNotation "void")])),
                         None, [], [], None, false,
-                        /root/ExternKeywordIsPresentInTrivia.fs (2,7--2,11)),
-                     /root/ExternKeywordIsPresentInTrivia.fs (2,0--2,28)),
-                  /root/ExternKeywordIsPresentInTrivia.fs (2,0--2,28),
+                        /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,7--2,11)),
+                     /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,0--2,28)),
+                  /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,0--2,28),
                   NoneAtInvisible,
                   { LeadingKeyword =
-                     Extern /root/ExternKeywordIsPresentInTrivia.fs (2,0--2,6)
+                     Extern
+                       /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,0--2,6)
                     InlineKeyword = None
                     EqualsRange = None })],
-              /root/ExternKeywordIsPresentInTrivia.fs (2,0--2,28))],
+              /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,0--2,28))],
           PreXmlDocEmpty, [], None,
-          /root/ExternKeywordIsPresentInTrivia.fs (2,0--2,28),
+          /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,0--2,28),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs.bsl b/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs.bsl
deleted file mode 100644
index bcaf022e4de..00000000000
--- a/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs.bsl
+++ /dev/null
@@ -1,20 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/GlobalInOpenPathShouldContainTrivia.fs", false,
-      QualifiedNameOfFile GlobalInOpenPathShouldContainTrivia, [], [],
-      [SynModuleOrNamespace
-         ([Ionide; VSCode; FSharp], false, DeclaredNamespace,
-          [Open
-             (ModuleOrNamespace
-                (SynLongIdent
-                   ([`global`; Node],
-                    [/root/GlobalInOpenPathShouldContainTrivia.fs (4,11--4,12)],
-                    [Some (OriginalNotation "global"); None]),
-                 /root/GlobalInOpenPathShouldContainTrivia.fs (4,5--4,16)),
-              /root/GlobalInOpenPathShouldContainTrivia.fs (4,0--4,16))],
-          PreXmlDocEmpty, [], None,
-          /root/GlobalInOpenPathShouldContainTrivia.fs (2,0--4,16),
-          { LeadingKeyword =
-             Namespace /root/GlobalInOpenPathShouldContainTrivia.fs (2,0--2,9) })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
deleted file mode 100644
index a2db2ab3cef..00000000000
--- a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
+++ /dev/null
@@ -1,41 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs", false,
-      QualifiedNameOfFile GlobalNamespaceShouldStartAtNamespaceKeyword, [], [],
-      [SynModuleOrNamespace
-         ([], false, GlobalNamespace,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [X],
-                     PreXmlDoc ((6,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,5--6,6)),
-                  Simple
-                    (TypeAbbrev
-                       (Ok, LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,9--6,12)),
-                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,9--6,12)),
-                  [], None,
-                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,5--6,12),
-                  { LeadingKeyword =
-                     Type
-                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,0--6,4)
-                    EqualsRange =
-                     Some
-                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,7--6,8)
-                    WithKeyword = None })],
-              /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,0--6,12))],
-          PreXmlDocEmpty, [], None,
-          /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (4,0--6,12),
-          { LeadingKeyword =
-             Namespace
-               /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (4,0--4,9) })],
-      (true, false),
-      { ConditionalDirectives = []
-        CodeComments =
-         [LineComment
-            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (2,0--2,6);
-          LineComment
-            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (3,0--3,6)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs.bsl b/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs.bsl
deleted file mode 100644
index b50fad05999..00000000000
--- a/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs.bsl
+++ /dev/null
@@ -1,27 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/If,ThenAndElseKeywordOnSeparateLines.fs", false,
-      QualifiedNameOfFile If,ThenAndElseKeywordOnSeparateLines, [], [],
-      [SynModuleOrNamespace
-         ([If,ThenAndElseKeywordOnSeparateLines], false, AnonModule,
-          [Expr
-             (IfThenElse
-                (Ident a, Ident b, Some (Ident c),
-                 Yes /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--3,4),
-                 false, /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--4,6),
-                 { IfKeyword =
-                    /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--2,2)
-                   IsElif = false
-                   ThenKeyword =
-                    /root/If,ThenAndElseKeywordOnSeparateLines.fs (3,0--3,4)
-                   ElseKeyword =
-                    Some
-                      /root/If,ThenAndElseKeywordOnSeparateLines.fs (4,0--4,4)
-                   IfToThenRange =
-                    /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--3,4) }),
-              /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--4,6))],
-          PreXmlDocEmpty, [], None,
-          /root/If,ThenAndElseKeywordOnSeparateLines.fs (2,0--5,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs.bsl
deleted file mode 100644
index 3928f27cd88..00000000000
--- a/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs.bsl
+++ /dev/null
@@ -1,21 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/IfKeywordInIfThenElse.fs", false,
-      QualifiedNameOfFile IfKeywordInIfThenElse, [], [],
-      [SynModuleOrNamespace
-         ([IfKeywordInIfThenElse], false, AnonModule,
-          [Expr
-             (IfThenElse
-                (Ident a, Ident b, None,
-                 Yes /root/IfKeywordInIfThenElse.fs (2,0--2,9), false,
-                 /root/IfKeywordInIfThenElse.fs (2,0--2,11),
-                 { IfKeyword = /root/IfKeywordInIfThenElse.fs (2,0--2,2)
-                   IsElif = false
-                   ThenKeyword = /root/IfKeywordInIfThenElse.fs (2,5--2,9)
-                   ElseKeyword = None
-                   IfToThenRange = /root/IfKeywordInIfThenElse.fs (2,0--2,9) }),
-              /root/IfKeywordInIfThenElse.fs (2,0--2,11))], PreXmlDocEmpty, [],
-          None, /root/IfKeywordInIfThenElse.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs b/tests/service/data/SyntaxTree/IfThenElse/CommentBetweenElseAndIf.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/CommentBetweenElseAndIf.fs
rename to tests/service/data/SyntaxTree/IfThenElse/CommentBetweenElseAndIf.fs
diff --git a/tests/service/data/SyntaxTree/IfThenElse/CommentBetweenElseAndIf.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/CommentBetweenElseAndIf.fs.bsl
new file mode 100644
index 00000000000..454213baa16
--- /dev/null
+++ b/tests/service/data/SyntaxTree/IfThenElse/CommentBetweenElseAndIf.fs.bsl
@@ -0,0 +1,43 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/IfThenElse/CommentBetweenElseAndIf.fs", false,
+      QualifiedNameOfFile CommentBetweenElseAndIf, [], [],
+      [SynModuleOrNamespace
+         ([CommentBetweenElseAndIf], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b,
+                 Some
+                   (IfThenElse
+                      (Ident c, Ident d, None,
+                       Yes
+                         /root/IfThenElse/CommentBetweenElseAndIf.fs (4,34--4,43),
+                       false,
+                       /root/IfThenElse/CommentBetweenElseAndIf.fs (4,34--5,1),
+                       { IfKeyword =
+                          /root/IfThenElse/CommentBetweenElseAndIf.fs (4,34--4,36)
+                         IsElif = false
+                         ThenKeyword =
+                          /root/IfThenElse/CommentBetweenElseAndIf.fs (4,39--4,43)
+                         ElseKeyword = None
+                         IfToThenRange =
+                          /root/IfThenElse/CommentBetweenElseAndIf.fs (4,34--4,43) })),
+                 Yes /root/IfThenElse/CommentBetweenElseAndIf.fs (2,0--2,9),
+                 false, /root/IfThenElse/CommentBetweenElseAndIf.fs (2,0--5,1),
+                 { IfKeyword =
+                    /root/IfThenElse/CommentBetweenElseAndIf.fs (2,0--2,2)
+                   IsElif = false
+                   ThenKeyword =
+                    /root/IfThenElse/CommentBetweenElseAndIf.fs (2,5--2,9)
+                   ElseKeyword =
+                    Some /root/IfThenElse/CommentBetweenElseAndIf.fs (4,0--4,4)
+                   IfToThenRange =
+                    /root/IfThenElse/CommentBetweenElseAndIf.fs (2,0--2,9) }),
+              /root/IfThenElse/CommentBetweenElseAndIf.fs (2,0--5,1))],
+          PreXmlDocEmpty, [], None,
+          /root/IfThenElse/CommentBetweenElseAndIf.fs (2,0--6,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [BlockComment /root/IfThenElse/CommentBetweenElseAndIf.fs (4,5--4,33)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs b/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/DeeplyNestedIfThenElse.fs
rename to tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs
diff --git a/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl
new file mode 100644
index 00000000000..089313be12b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl
@@ -0,0 +1,59 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/IfThenElse/DeeplyNestedIfThenElse.fs", false,
+      QualifiedNameOfFile DeeplyNestedIfThenElse, [], [],
+      [SynModuleOrNamespace
+         ([DeeplyNestedIfThenElse], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b,
+                 Some
+                   (IfThenElse
+                      (Ident c, Ident d,
+                       Some
+                         (IfThenElse
+                            (Ident e, Ident f, Some (Ident g),
+                             Yes
+                               /root/IfThenElse/DeeplyNestedIfThenElse.fs (7,8--7,17),
+                             false,
+                             /root/IfThenElse/DeeplyNestedIfThenElse.fs (7,8--10,13),
+                             { IfKeyword =
+                                /root/IfThenElse/DeeplyNestedIfThenElse.fs (7,8--7,10)
+                               IsElif = false
+                               ThenKeyword =
+                                /root/IfThenElse/DeeplyNestedIfThenElse.fs (7,13--7,17)
+                               ElseKeyword =
+                                Some
+                                  /root/IfThenElse/DeeplyNestedIfThenElse.fs (9,8--9,12)
+                               IfToThenRange =
+                                /root/IfThenElse/DeeplyNestedIfThenElse.fs (7,8--7,17) })),
+                       Yes
+                         /root/IfThenElse/DeeplyNestedIfThenElse.fs (4,0--4,11),
+                       false,
+                       /root/IfThenElse/DeeplyNestedIfThenElse.fs (4,0--10,13),
+                       { IfKeyword =
+                          /root/IfThenElse/DeeplyNestedIfThenElse.fs (4,0--4,4)
+                         IsElif = true
+                         ThenKeyword =
+                          /root/IfThenElse/DeeplyNestedIfThenElse.fs (4,7--4,11)
+                         ElseKeyword =
+                          Some
+                            /root/IfThenElse/DeeplyNestedIfThenElse.fs (6,0--6,4)
+                         IfToThenRange =
+                          /root/IfThenElse/DeeplyNestedIfThenElse.fs (4,0--4,11) })),
+                 Yes /root/IfThenElse/DeeplyNestedIfThenElse.fs (2,0--2,9),
+                 false, /root/IfThenElse/DeeplyNestedIfThenElse.fs (2,0--10,13),
+                 { IfKeyword =
+                    /root/IfThenElse/DeeplyNestedIfThenElse.fs (2,0--2,2)
+                   IsElif = false
+                   ThenKeyword =
+                    /root/IfThenElse/DeeplyNestedIfThenElse.fs (2,5--2,9)
+                   ElseKeyword = None
+                   IfToThenRange =
+                    /root/IfThenElse/DeeplyNestedIfThenElse.fs (2,0--2,9) }),
+              /root/IfThenElse/DeeplyNestedIfThenElse.fs (2,0--10,13))],
+          PreXmlDocEmpty, [], None,
+          /root/IfThenElse/DeeplyNestedIfThenElse.fs (2,0--11,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs b/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ElseKeywordInSimpleIfThenElse.fs
rename to tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs
diff --git a/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl
new file mode 100644
index 00000000000..d190a837106
--- /dev/null
+++ b/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl
@@ -0,0 +1,29 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/IfThenElse/ElseKeywordInSimpleIfThenElse.fs", false,
+      QualifiedNameOfFile ElseKeywordInSimpleIfThenElse, [], [],
+      [SynModuleOrNamespace
+         ([ElseKeywordInSimpleIfThenElse], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b, Some (Ident c),
+                 Yes
+                   /root/IfThenElse/ElseKeywordInSimpleIfThenElse.fs (2,0--2,9),
+                 false,
+                 /root/IfThenElse/ElseKeywordInSimpleIfThenElse.fs (2,0--2,18),
+                 { IfKeyword =
+                    /root/IfThenElse/ElseKeywordInSimpleIfThenElse.fs (2,0--2,2)
+                   IsElif = false
+                   ThenKeyword =
+                    /root/IfThenElse/ElseKeywordInSimpleIfThenElse.fs (2,5--2,9)
+                   ElseKeyword =
+                    Some
+                      /root/IfThenElse/ElseKeywordInSimpleIfThenElse.fs (2,12--2,16)
+                   IfToThenRange =
+                    /root/IfThenElse/ElseKeywordInSimpleIfThenElse.fs (2,0--2,9) }),
+              /root/IfThenElse/ElseKeywordInSimpleIfThenElse.fs (2,0--2,18))],
+          PreXmlDocEmpty, [], None,
+          /root/IfThenElse/ElseKeywordInSimpleIfThenElse.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs b/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/IfKeywordInIfThenElse.fs
rename to tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs
diff --git a/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl
new file mode 100644
index 00000000000..4c2244adb4b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl
@@ -0,0 +1,25 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/IfThenElse/IfKeywordInIfThenElse.fs", false,
+      QualifiedNameOfFile IfKeywordInIfThenElse, [], [],
+      [SynModuleOrNamespace
+         ([IfKeywordInIfThenElse], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b, None,
+                 Yes /root/IfThenElse/IfKeywordInIfThenElse.fs (2,0--2,9), false,
+                 /root/IfThenElse/IfKeywordInIfThenElse.fs (2,0--2,11),
+                 { IfKeyword =
+                    /root/IfThenElse/IfKeywordInIfThenElse.fs (2,0--2,2)
+                   IsElif = false
+                   ThenKeyword =
+                    /root/IfThenElse/IfKeywordInIfThenElse.fs (2,5--2,9)
+                   ElseKeyword = None
+                   IfToThenRange =
+                    /root/IfThenElse/IfKeywordInIfThenElse.fs (2,0--2,9) }),
+              /root/IfThenElse/IfKeywordInIfThenElse.fs (2,0--2,11))],
+          PreXmlDocEmpty, [], None,
+          /root/IfThenElse/IfKeywordInIfThenElse.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs b/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/If,ThenAndElseKeywordOnSeparateLines.fs
rename to tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs
diff --git a/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl
new file mode 100644
index 00000000000..eeae62f9df4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl
@@ -0,0 +1,29 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs", false,
+      QualifiedNameOfFile IfThenAndElseKeywordOnSeparateLines, [], [],
+      [SynModuleOrNamespace
+         ([IfThenAndElseKeywordOnSeparateLines], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b, Some (Ident c),
+                 Yes
+                   /root/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs (2,0--3,4),
+                 false,
+                 /root/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs (2,0--4,6),
+                 { IfKeyword =
+                    /root/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs (2,0--2,2)
+                   IsElif = false
+                   ThenKeyword =
+                    /root/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs (3,0--3,4)
+                   ElseKeyword =
+                    Some
+                      /root/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs (4,0--4,4)
+                   IfToThenRange =
+                    /root/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs (2,0--3,4) }),
+              /root/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs (2,0--4,6))],
+          PreXmlDocEmpty, [], None,
+          /root/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs (2,0--5,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs b/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs
rename to tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs
diff --git a/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl
new file mode 100644
index 00000000000..98023d761f5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl
@@ -0,0 +1,40 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/IfThenElse/NestedElifInIfThenElse.fs", false,
+      QualifiedNameOfFile NestedElifInIfThenElse, [], [],
+      [SynModuleOrNamespace
+         ([NestedElifInIfThenElse], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b,
+                 Some
+                   (IfThenElse
+                      (Ident c, Ident d, None,
+                       Yes
+                         /root/IfThenElse/NestedElifInIfThenElse.fs (4,0--4,11),
+                       false,
+                       /root/IfThenElse/NestedElifInIfThenElse.fs (4,0--4,13),
+                       { IfKeyword =
+                          /root/IfThenElse/NestedElifInIfThenElse.fs (4,0--4,4)
+                         IsElif = true
+                         ThenKeyword =
+                          /root/IfThenElse/NestedElifInIfThenElse.fs (4,7--4,11)
+                         ElseKeyword = None
+                         IfToThenRange =
+                          /root/IfThenElse/NestedElifInIfThenElse.fs (4,0--4,11) })),
+                 Yes /root/IfThenElse/NestedElifInIfThenElse.fs (2,0--2,9),
+                 false, /root/IfThenElse/NestedElifInIfThenElse.fs (2,0--4,13),
+                 { IfKeyword =
+                    /root/IfThenElse/NestedElifInIfThenElse.fs (2,0--2,2)
+                   IsElif = false
+                   ThenKeyword =
+                    /root/IfThenElse/NestedElifInIfThenElse.fs (2,5--2,9)
+                   ElseKeyword = None
+                   IfToThenRange =
+                    /root/IfThenElse/NestedElifInIfThenElse.fs (2,0--2,9) }),
+              /root/IfThenElse/NestedElifInIfThenElse.fs (2,0--4,13))],
+          PreXmlDocEmpty, [], None,
+          /root/IfThenElse/NestedElifInIfThenElse.fs (2,0--5,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs
rename to tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs
diff --git a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl
new file mode 100644
index 00000000000..0e7655c5156
--- /dev/null
+++ b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl
@@ -0,0 +1,41 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/IfThenElse/NestedElseIfInIfThenElse.fs", false,
+      QualifiedNameOfFile NestedElseIfInIfThenElse, [], [],
+      [SynModuleOrNamespace
+         ([NestedElseIfInIfThenElse], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b,
+                 Some
+                   (IfThenElse
+                      (Ident c, Ident d, None,
+                       Yes
+                         /root/IfThenElse/NestedElseIfInIfThenElse.fs (5,4--5,13),
+                       false,
+                       /root/IfThenElse/NestedElseIfInIfThenElse.fs (5,4--5,15),
+                       { IfKeyword =
+                          /root/IfThenElse/NestedElseIfInIfThenElse.fs (5,4--5,6)
+                         IsElif = false
+                         ThenKeyword =
+                          /root/IfThenElse/NestedElseIfInIfThenElse.fs (5,9--5,13)
+                         ElseKeyword = None
+                         IfToThenRange =
+                          /root/IfThenElse/NestedElseIfInIfThenElse.fs (5,4--5,13) })),
+                 Yes /root/IfThenElse/NestedElseIfInIfThenElse.fs (2,0--2,9),
+                 false, /root/IfThenElse/NestedElseIfInIfThenElse.fs (2,0--5,15),
+                 { IfKeyword =
+                    /root/IfThenElse/NestedElseIfInIfThenElse.fs (2,0--2,2)
+                   IsElif = false
+                   ThenKeyword =
+                    /root/IfThenElse/NestedElseIfInIfThenElse.fs (2,5--2,9)
+                   ElseKeyword =
+                    Some /root/IfThenElse/NestedElseIfInIfThenElse.fs (4,0--4,4)
+                   IfToThenRange =
+                    /root/IfThenElse/NestedElseIfInIfThenElse.fs (2,0--2,9) }),
+              /root/IfThenElse/NestedElseIfInIfThenElse.fs (2,0--5,15))],
+          PreXmlDocEmpty, [], None,
+          /root/IfThenElse/NestedElseIfInIfThenElse.fs (2,0--6,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs
rename to tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs
diff --git a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
new file mode 100644
index 00000000000..378d5f24b3e
--- /dev/null
+++ b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
@@ -0,0 +1,44 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs", false,
+      QualifiedNameOfFile NestedElseIfOnTheSameLineInIfThenElse, [], [],
+      [SynModuleOrNamespace
+         ([NestedElseIfOnTheSameLineInIfThenElse], false, AnonModule,
+          [Expr
+             (IfThenElse
+                (Ident a, Ident b,
+                 Some
+                   (IfThenElse
+                      (Ident c, Ident d, None,
+                       Yes
+                         /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (4,5--4,14),
+                       false,
+                       /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (4,5--5,1),
+                       { IfKeyword =
+                          /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (4,5--4,7)
+                         IsElif = false
+                         ThenKeyword =
+                          /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (4,10--4,14)
+                         ElseKeyword = None
+                         IfToThenRange =
+                          /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (4,5--4,14) })),
+                 Yes
+                   /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--2,9),
+                 false,
+                 /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--5,1),
+                 { IfKeyword =
+                    /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--2,2)
+                   IsElif = false
+                   ThenKeyword =
+                    /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (2,5--2,9)
+                   ElseKeyword =
+                    Some
+                      /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (4,0--4,4)
+                   IfToThenRange =
+                    /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--2,9) }),
+              /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--5,1))],
+          PreXmlDocEmpty, [], None,
+          /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--6,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InHeadPattern.fs.bsl b/tests/service/data/SyntaxTree/InHeadPattern.fs.bsl
deleted file mode 100644
index b8449bc39f6..00000000000
--- a/tests/service/data/SyntaxTree/InHeadPattern.fs.bsl
+++ /dev/null
@@ -1,39 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/InHeadPattern.fs", false, QualifiedNameOfFile InHeadPattern, [], [],
-      [SynModuleOrNamespace
-         ([InHeadPattern], false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  ListCons
-                    (Const (Int32 1, /root/InHeadPattern.fs (2,4--2,5)),
-                     Wild /root/InHeadPattern.fs (2,9--2,10),
-                     /root/InHeadPattern.fs (2,4--2,10),
-                     { ColonColonRange = /root/InHeadPattern.fs (2,6--2,8) }),
-                  None,
-                  ArrayOrListComputed
-                    (false,
-                     Sequential
-                       (SuppressNeither, true,
-                        Const (Int32 4, /root/InHeadPattern.fs (2,15--2,16)),
-                        Sequential
-                          (SuppressNeither, true,
-                           Const (Int32 5, /root/InHeadPattern.fs (2,18--2,19)),
-                           Const (Int32 6, /root/InHeadPattern.fs (2,21--2,22)),
-                           /root/InHeadPattern.fs (2,18--2,22)),
-                        /root/InHeadPattern.fs (2,15--2,22)),
-                     /root/InHeadPattern.fs (2,13--2,24)),
-                  /root/InHeadPattern.fs (2,4--2,10),
-                  Yes /root/InHeadPattern.fs (2,0--2,24),
-                  { LeadingKeyword = Let /root/InHeadPattern.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange = Some /root/InHeadPattern.fs (2,11--2,12) })],
-              /root/InHeadPattern.fs (2,0--2,24))], PreXmlDocEmpty, [], None,
-          /root/InHeadPattern.fs (2,0--3,0), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/IncompleteLongIdent.fs.bsl b/tests/service/data/SyntaxTree/IncompleteLongIdent.fs.bsl
deleted file mode 100644
index 2467b626f3d..00000000000
--- a/tests/service/data/SyntaxTree/IncompleteLongIdent.fs.bsl
+++ /dev/null
@@ -1,17 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/IncompleteLongIdent.fs", false, QualifiedNameOfFile Module, [], [],
-      [SynModuleOrNamespace
-         ([Module], false, NamedModule,
-          [Expr
-             (LongIdent
-                (false,
-                 SynLongIdent
-                   ([A], [/root/IncompleteLongIdent.fs (4,1--4,2)], [None]),
-                 None, /root/IncompleteLongIdent.fs (4,0--4,2)),
-              /root/IncompleteLongIdent.fs (4,0--4,2))],
-          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/IncompleteLongIdent.fs (2,0--4,2),
-          { LeadingKeyword = Module /root/IncompleteLongIdent.fs (2,0--2,6) })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InfixOperation.fs.bsl b/tests/service/data/SyntaxTree/InfixOperation.fs.bsl
deleted file mode 100644
index 8e400070d47..00000000000
--- a/tests/service/data/SyntaxTree/InfixOperation.fs.bsl
+++ /dev/null
@@ -1,24 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/InfixOperation.fs", false, QualifiedNameOfFile InfixOperation, [],
-      [],
-      [SynModuleOrNamespace
-         ([InfixOperation], false, AnonModule,
-          [Expr
-             (App
-                (NonAtomic, false,
-                 App
-                   (NonAtomic, true,
-                    LongIdent
-                      (false,
-                       SynLongIdent
-                         ([op_Addition], [], [Some (OriginalNotation "+")]),
-                       None, /root/InfixOperation.fs (2,2--2,3)),
-                    Const (Int32 1, /root/InfixOperation.fs (2,0--2,1)),
-                    /root/InfixOperation.fs (2,0--2,3)),
-                 Const (Int32 1, /root/InfixOperation.fs (2,4--2,5)),
-                 /root/InfixOperation.fs (2,0--2,5)),
-              /root/InfixOperation.fs (2,0--2,5))], PreXmlDocEmpty, [], None,
-          /root/InfixOperation.fs (2,0--2,5), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
deleted file mode 100644
index 93f8e073b73..00000000000
--- a/tests/service/data/SyntaxTree/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
+++ /dev/null
@@ -1,44 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs",
-      false,
-      QualifiedNameOfFile
-        InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField,
-      [], [],
-      [SynModuleOrNamespace
-         ([InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField],
-          false, AnonModule,
-          [Expr
-             (Record
-                (Some
-                   (LongIdent (SynLongIdent ([Exception], [], [None])),
-                    Paren
-                      (Ident msg,
-                       /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,19--2,20),
-                       Some
-                         /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,23--2,24),
-                       /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,19--2,24)),
-                    /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,10--2,24),
-                    Some
-                      (/root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,24--2,25),
-                       Some (2,25)),
-                    /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,2--2,9)),
-                 None,
-                 [SynExprRecordField
-                    ((SynLongIdent ([X], [], [None]), true),
-                     Some
-                       /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,28--2,29),
-                     Some
-                       (Const
-                          (Int32 1,
-                           /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,30--2,31))),
-                     Some
-                       (/root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,31--2,32),
-                        Some (2,32)))],
-                 /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--2,34)),
-              /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--2,34))],
-          PreXmlDocEmpty, [], None,
-          /root/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--2,34),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InlineKeyword.fsi.bsl b/tests/service/data/SyntaxTree/InlineKeyword.fsi.bsl
deleted file mode 100644
index 0d6932ecdec..00000000000
--- a/tests/service/data/SyntaxTree/InlineKeyword.fsi.bsl
+++ /dev/null
@@ -1,26 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/InlineKeyword.fsi", QualifiedNameOfFile InlineKeyword, [], [],
-      [SynModuleOrNamespaceSig
-         ([X], false, DeclaredNamespace,
-          [Val
-             (SynValSig
-                ([], SynIdent (meh, None), SynValTyparDecls (None, true),
-                 Fun
-                   (LongIdent (SynLongIdent ([int], [], [None])),
-                    LongIdent (SynLongIdent ([int], [], [None])),
-                    /root/InlineKeyword.fsi (4,16--4,26),
-                    { ArrowRange = /root/InlineKeyword.fsi (4,20--4,22) }),
-                 SynValInfo
-                   ([[SynArgInfo ([], false, None)]],
-                    SynArgInfo ([], false, None)), true, false,
-                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 None, /root/InlineKeyword.fsi (4,0--4,26),
-                 { LeadingKeyword = Val /root/InlineKeyword.fsi (4,0--4,3)
-                   InlineKeyword = Some /root/InlineKeyword.fsi (4,4--4,10)
-                   WithKeyword = None
-                   EqualsRange = None }), /root/InlineKeyword.fsi (4,0--4,26))],
-          PreXmlDocEmpty, [], None, /root/InlineKeyword.fsi (2,0--4,26),
-          { LeadingKeyword = Namespace /root/InlineKeyword.fsi (2,0--2,9) })],
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs
rename to tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs
diff --git a/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl
similarity index 51%
rename from tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs.bsl
rename to tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl
index b8bb72b4a34..cea7f8be3ed 100644
--- a/tests/service/data/SyntaxTree/ComplexArgumentsLambdaHasArrowRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/ComplexArgumentsLambdaHasArrowRange.fs", false,
+     ("/root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs", false,
       QualifiedNameOfFile ComplexArgumentsLambdaHasArrowRange, [], [],
       [SynModuleOrNamespace
          ([ComplexArgumentsLambdaHasArrowRange], false, AnonModule,
@@ -10,41 +10,41 @@ ImplFile
                  SimplePats
                    ([Id
                        (x, None, false, false, false,
-                        /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,6));
+                        /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,6));
                      Id
                        (_arg3, None, true, false, false,
-                        /root/ComplexArgumentsLambdaHasArrowRange.fs (2,8--2,9))],
-                    /root/ComplexArgumentsLambdaHasArrowRange.fs (2,4--2,10)),
+                        /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (2,8--2,9))],
+                    /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (2,4--2,10)),
                  Lambda
                    (false, true,
                     SimplePats
                       ([Id
                           (_arg2, None, true, false, false,
-                           /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17))],
-                       /root/ComplexArgumentsLambdaHasArrowRange.fs (3,4--3,18)),
+                           /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17))],
+                       /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,4--3,18)),
                     Lambda
                       (false, true,
                        SimplePats
                          ([Id
                              (_arg1, None, true, false, false,
-                              /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19))],
-                          /root/ComplexArgumentsLambdaHasArrowRange.fs (4,4--4,20)),
+                              /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19))],
+                          /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,4--4,20)),
                        Match
                          (NoneAtInvisible, Ident _arg2,
                           [SynMatchClause
                              (Record
                                 ([(([], Y),
-                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (3,9--3,10),
+                                   /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,9--3,10),
                                    ListCons
                                      (Named
                                         (SynIdent (h, None), false, None,
-                                         /root/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,12)),
+                                         /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,12)),
                                       Wild
-                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (3,14--3,15),
-                                      /root/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,15),
+                                        /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,14--3,15),
+                                      /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,15),
                                       { ColonColonRange =
-                                         /root/ComplexArgumentsLambdaHasArrowRange.fs (3,12--3,14) }))],
-                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17)),
+                                         /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,12--3,14) }))],
+                                 /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17)),
                               None,
                               Match
                                 (NoneAtInvisible, Ident _arg1,
@@ -56,10 +56,10 @@ ImplFile
                                           [Paren
                                              (Named
                                                 (SynIdent (z, None), false, None,
-                                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (4,17--4,18)),
-                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (4,16--4,19))],
+                                                 /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,17--4,18)),
+                                              /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,16--4,19))],
                                         None,
-                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19)),
+                                        /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19)),
                                      None,
                                      App
                                        (NonAtomic, false,
@@ -71,7 +71,7 @@ ImplFile
                                                 ([op_Addition], [],
                                                  [Some (OriginalNotation "+")]),
                                               None,
-                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (6,10--6,11)),
+                                              /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (6,10--6,11)),
                                            App
                                              (NonAtomic, false,
                                               App
@@ -83,66 +83,66 @@ ImplFile
                                                        [Some
                                                           (OriginalNotation "*")]),
                                                     None,
-                                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (6,6--6,7)),
+                                                    /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (6,6--6,7)),
                                                  Ident x,
-                                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,7)),
+                                                 /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,7)),
                                               Ident y,
-                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,9)),
-                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,11)),
+                                              /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,9)),
+                                           /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,11)),
                                         Ident z,
-                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,13)),
-                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19),
+                                        /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,13)),
+                                     /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19),
                                      No, { ArrowRange = None
                                            BarRange = None })],
-                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13),
+                                 /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13),
                                  { MatchKeyword =
-                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13)
+                                    /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13)
                                    WithKeyword =
-                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13) }),
-                              /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17),
+                                    /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13) }),
+                              /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17),
                               No, { ArrowRange = None
                                     BarRange = None })],
-                          /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13),
+                          /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13),
                           { MatchKeyword =
-                             /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13)
+                             /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13)
                             WithKeyword =
-                             /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13) }),
+                             /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13) }),
                        None,
-                       /root/ComplexArgumentsLambdaHasArrowRange.fs (2,0--6,13),
+                       /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (2,0--6,13),
                        { ArrowRange =
                           Some
-                            /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,6) }),
+                            /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,6) }),
                     None,
-                    /root/ComplexArgumentsLambdaHasArrowRange.fs (2,0--6,13),
+                    /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (2,0--6,13),
                     { ArrowRange =
                        Some
-                         /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,6) }),
+                         /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,6) }),
                  Some
                    ([Paren
                        (Tuple
                           (false,
                            [Named
                               (SynIdent (x, None), false, None,
-                               /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,6));
+                               /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,6));
                             Wild
-                              /root/ComplexArgumentsLambdaHasArrowRange.fs (2,8--2,9)],
-                           /root/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,9)),
-                        /root/ComplexArgumentsLambdaHasArrowRange.fs (2,4--2,10));
+                              /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (2,8--2,9)],
+                           /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (2,5--2,9)),
+                        /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (2,4--2,10));
                      Paren
                        (Record
                           ([(([], Y),
-                             /root/ComplexArgumentsLambdaHasArrowRange.fs (3,9--3,10),
+                             /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,9--3,10),
                              ListCons
                                (Named
                                   (SynIdent (h, None), false, None,
-                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,12)),
+                                   /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,12)),
                                 Wild
-                                  /root/ComplexArgumentsLambdaHasArrowRange.fs (3,14--3,15),
-                                /root/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,15),
+                                  /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,14--3,15),
+                                /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,15),
                                 { ColonColonRange =
-                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (3,12--3,14) }))],
-                           /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17)),
-                        /root/ComplexArgumentsLambdaHasArrowRange.fs (3,4--3,18));
+                                   /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,12--3,14) }))],
+                           /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17)),
+                        /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,4--3,18));
                      Paren
                        (LongIdent
                           (SynLongIdent ([SomePattern], [], [None]), None, None,
@@ -150,27 +150,27 @@ ImplFile
                              [Paren
                                 (Named
                                    (SynIdent (z, None), false, None,
-                                    /root/ComplexArgumentsLambdaHasArrowRange.fs (4,17--4,18)),
-                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (4,16--4,19))],
+                                    /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,17--4,18)),
+                                 /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,16--4,19))],
                            None,
-                           /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19)),
-                        /root/ComplexArgumentsLambdaHasArrowRange.fs (4,4--4,20))],
+                           /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19)),
+                        /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,4--4,20))],
                     Match
                       (NoneAtInvisible, Ident _arg2,
                        [SynMatchClause
                           (Record
                              ([(([], Y),
-                                /root/ComplexArgumentsLambdaHasArrowRange.fs (3,9--3,10),
+                                /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,9--3,10),
                                 ListCons
                                   (Named
                                      (SynIdent (h, None), false, None,
-                                      /root/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,12)),
+                                      /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,12)),
                                    Wild
-                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (3,14--3,15),
-                                   /root/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,15),
+                                     /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,14--3,15),
+                                   /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,11--3,15),
                                    { ColonColonRange =
-                                      /root/ComplexArgumentsLambdaHasArrowRange.fs (3,12--3,14) }))],
-                              /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17)),
+                                      /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,12--3,14) }))],
+                              /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17)),
                            None,
                            Match
                              (NoneAtInvisible, Ident _arg1,
@@ -182,10 +182,10 @@ ImplFile
                                        [Paren
                                           (Named
                                              (SynIdent (z, None), false, None,
-                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (4,17--4,18)),
-                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (4,16--4,19))],
+                                              /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,17--4,18)),
+                                           /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,16--4,19))],
                                      None,
-                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19)),
+                                     /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19)),
                                   None,
                                   App
                                     (NonAtomic, false,
@@ -197,7 +197,7 @@ ImplFile
                                              ([op_Addition], [],
                                               [Some (OriginalNotation "+")]),
                                            None,
-                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (6,10--6,11)),
+                                           /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (6,10--6,11)),
                                         App
                                           (NonAtomic, false,
                                            App
@@ -208,36 +208,37 @@ ImplFile
                                                    ([op_Multiply], [],
                                                     [Some (OriginalNotation "*")]),
                                                  None,
-                                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (6,6--6,7)),
+                                                 /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (6,6--6,7)),
                                               Ident x,
-                                              /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,7)),
+                                              /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,7)),
                                            Ident y,
-                                           /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,9)),
-                                        /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,11)),
+                                           /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,9)),
+                                        /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,11)),
                                      Ident z,
-                                     /root/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,13)),
-                                  /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19),
+                                     /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (6,4--6,13)),
+                                  /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,5--4,19),
                                   No, { ArrowRange = None
                                         BarRange = None })],
-                              /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13),
+                              /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13),
                               { MatchKeyword =
-                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13)
+                                 /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13)
                                 WithKeyword =
-                                 /root/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13) }),
-                           /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17),
+                                 /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (4,5--6,13) }),
+                           /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,5--3,17),
                            No, { ArrowRange = None
                                  BarRange = None })],
-                       /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13),
+                       /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13),
                        { MatchKeyword =
-                          /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13)
+                          /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13)
                          WithKeyword =
-                          /root/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13) })),
-                 /root/ComplexArgumentsLambdaHasArrowRange.fs (2,0--6,13),
+                          /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (3,5--6,13) })),
+                 /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (2,0--6,13),
                  { ArrowRange =
-                    Some /root/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,6) }),
-              /root/ComplexArgumentsLambdaHasArrowRange.fs (2,0--6,13))],
+                    Some
+                      /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (5,4--5,6) }),
+              /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (2,0--6,13))],
           PreXmlDocEmpty, [], None,
-          /root/ComplexArgumentsLambdaHasArrowRange.fs (2,0--7,0),
+          /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/DestructedLambdaHasArrowRange.fs
rename to tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs
diff --git a/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl
new file mode 100644
index 00000000000..b42322e4136
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl
@@ -0,0 +1,102 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Lambda/DestructedLambdaHasArrowRange.fs", false,
+      QualifiedNameOfFile DestructedLambdaHasArrowRange, [], [],
+      [SynModuleOrNamespace
+         ([DestructedLambdaHasArrowRange], false, AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (_arg1, None, true, false, false,
+                        /root/Lambda/DestructedLambdaHasArrowRange.fs (2,4--2,13))],
+                    /root/Lambda/DestructedLambdaHasArrowRange.fs (2,4--2,13)),
+                 Match
+                   (NoneAtInvisible, Ident _arg1,
+                    [SynMatchClause
+                       (Record
+                          ([(([], X),
+                             /root/Lambda/DestructedLambdaHasArrowRange.fs (2,8--2,9),
+                             Named
+                               (SynIdent (x, None), false, None,
+                                /root/Lambda/DestructedLambdaHasArrowRange.fs (2,10--2,11)))],
+                           /root/Lambda/DestructedLambdaHasArrowRange.fs (2,4--2,13)),
+                        None,
+                        App
+                          (NonAtomic, false,
+                           App
+                             (NonAtomic, true,
+                              LongIdent
+                                (false,
+                                 SynLongIdent
+                                   ([op_Multiply], [],
+                                    [Some (OriginalNotation "*")]), None,
+                                 /root/Lambda/DestructedLambdaHasArrowRange.fs (2,19--2,20)),
+                              Ident x,
+                              /root/Lambda/DestructedLambdaHasArrowRange.fs (2,17--2,20)),
+                           Const
+                             (Int32 2,
+                              /root/Lambda/DestructedLambdaHasArrowRange.fs (2,21--2,22)),
+                           /root/Lambda/DestructedLambdaHasArrowRange.fs (2,17--2,22)),
+                        /root/Lambda/DestructedLambdaHasArrowRange.fs (2,4--2,13),
+                        No, { ArrowRange = None
+                              BarRange = None })],
+                    /root/Lambda/DestructedLambdaHasArrowRange.fs (2,4--2,22),
+                    { MatchKeyword =
+                       /root/Lambda/DestructedLambdaHasArrowRange.fs (2,4--2,22)
+                      WithKeyword =
+                       /root/Lambda/DestructedLambdaHasArrowRange.fs (2,4--2,22) }),
+                 Some
+                   ([Record
+                       ([(([], X),
+                          /root/Lambda/DestructedLambdaHasArrowRange.fs (2,8--2,9),
+                          Named
+                            (SynIdent (x, None), false, None,
+                             /root/Lambda/DestructedLambdaHasArrowRange.fs (2,10--2,11)))],
+                        /root/Lambda/DestructedLambdaHasArrowRange.fs (2,4--2,13))],
+                    Match
+                      (NoneAtInvisible, Ident _arg1,
+                       [SynMatchClause
+                          (Record
+                             ([(([], X),
+                                /root/Lambda/DestructedLambdaHasArrowRange.fs (2,8--2,9),
+                                Named
+                                  (SynIdent (x, None), false, None,
+                                   /root/Lambda/DestructedLambdaHasArrowRange.fs (2,10--2,11)))],
+                              /root/Lambda/DestructedLambdaHasArrowRange.fs (2,4--2,13)),
+                           None,
+                           App
+                             (NonAtomic, false,
+                              App
+                                (NonAtomic, true,
+                                 LongIdent
+                                   (false,
+                                    SynLongIdent
+                                      ([op_Multiply], [],
+                                       [Some (OriginalNotation "*")]), None,
+                                    /root/Lambda/DestructedLambdaHasArrowRange.fs (2,19--2,20)),
+                                 Ident x,
+                                 /root/Lambda/DestructedLambdaHasArrowRange.fs (2,17--2,20)),
+                              Const
+                                (Int32 2,
+                                 /root/Lambda/DestructedLambdaHasArrowRange.fs (2,21--2,22)),
+                              /root/Lambda/DestructedLambdaHasArrowRange.fs (2,17--2,22)),
+                           /root/Lambda/DestructedLambdaHasArrowRange.fs (2,4--2,13),
+                           No, { ArrowRange = None
+                                 BarRange = None })],
+                       /root/Lambda/DestructedLambdaHasArrowRange.fs (2,4--2,22),
+                       { MatchKeyword =
+                          /root/Lambda/DestructedLambdaHasArrowRange.fs (2,4--2,22)
+                         WithKeyword =
+                          /root/Lambda/DestructedLambdaHasArrowRange.fs (2,4--2,22) })),
+                 /root/Lambda/DestructedLambdaHasArrowRange.fs (2,0--2,22),
+                 { ArrowRange =
+                    Some
+                      /root/Lambda/DestructedLambdaHasArrowRange.fs (2,14--2,16) }),
+              /root/Lambda/DestructedLambdaHasArrowRange.fs (2,0--2,22))],
+          PreXmlDocEmpty, [], None,
+          /root/Lambda/DestructedLambdaHasArrowRange.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs b/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs
rename to tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs
diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
new file mode 100644
index 00000000000..50fd6d0cc22
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
@@ -0,0 +1,72 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs",
+      false,
+      QualifiedNameOfFile LambdaWithTupleParameterWithWildCardGivesCorrectBody,
+      [], [],
+      [SynModuleOrNamespace
+         ([LambdaWithTupleParameterWithWildCardGivesCorrectBody], false,
+          AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (a, None, false, false, false,
+                        /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,4--2,5))],
+                    /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,4--2,5)),
+                 Lambda
+                   (false, true,
+                    SimplePats
+                      ([Id
+                          (b, None, false, false, false,
+                           /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,7--2,8));
+                        Id
+                          (_arg1, None, true, false, false,
+                           /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,10--2,11))],
+                       /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,6--2,12)),
+                    Lambda
+                      (false, true,
+                       SimplePats
+                         ([Id
+                             (c, None, false, false, false,
+                              /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,13--2,14))],
+                          /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,13--2,14)),
+                       Ident x, None,
+                       /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--2,19),
+                       { ArrowRange =
+                          Some
+                            /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,15--2,17) }),
+                    None,
+                    /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--2,19),
+                    { ArrowRange =
+                       Some
+                         /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,15--2,17) }),
+                 Some
+                   ([Named
+                       (SynIdent (a, None), false, None,
+                        /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,4--2,5));
+                     Paren
+                       (Tuple
+                          (false,
+                           [Named
+                              (SynIdent (b, None), false, None,
+                               /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,7--2,8));
+                            Wild
+                              /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,10--2,11)],
+                           /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,7--2,11)),
+                        /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,6--2,12));
+                     Named
+                       (SynIdent (c, None), false, None,
+                        /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,13--2,14))],
+                    Ident x),
+                 /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--2,19),
+                 { ArrowRange =
+                    Some
+                      /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,15--2,17) }),
+              /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--2,19))],
+          PreXmlDocEmpty, [], None,
+          /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs b/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs
rename to tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs
diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
new file mode 100644
index 00000000000..be48a4506b2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
@@ -0,0 +1,44 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs", false,
+      QualifiedNameOfFile LambdaWithTwoParametersGivesCorrectBody, [], [],
+      [SynModuleOrNamespace
+         ([LambdaWithTwoParametersGivesCorrectBody], false, AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (a, None, false, false, false,
+                        /root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs (2,4--2,5))],
+                    /root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs (2,4--2,5)),
+                 Lambda
+                   (false, true,
+                    SimplePats
+                      ([Id
+                          (b, None, false, false, false,
+                           /root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs (2,6--2,7))],
+                       /root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs (2,6--2,7)),
+                    Ident x, None,
+                    /root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs (2,0--2,12),
+                    { ArrowRange =
+                       Some
+                         /root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs (2,8--2,10) }),
+                 Some
+                   ([Named
+                       (SynIdent (a, None), false, None,
+                        /root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs (2,4--2,5));
+                     Named
+                       (SynIdent (b, None), false, None,
+                        /root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs (2,6--2,7))],
+                    Ident x),
+                 /root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs (2,0--2,12),
+                 { ArrowRange =
+                    Some
+                      /root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs (2,8--2,10) }),
+              /root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs (2,0--2,12))],
+          PreXmlDocEmpty, [], None,
+          /root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs
rename to tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs
diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
new file mode 100644
index 00000000000..69d5e128a19
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
@@ -0,0 +1,58 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs", false,
+      QualifiedNameOfFile LambdaWithWildCardParameterGivesCorrectBody, [], [],
+      [SynModuleOrNamespace
+         ([LambdaWithWildCardParameterGivesCorrectBody], false, AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (a, None, false, false, false,
+                        /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,4--2,5))],
+                    /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,4--2,5)),
+                 Lambda
+                   (false, true,
+                    SimplePats
+                      ([Id
+                          (_arg1, None, true, false, false,
+                           /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,6--2,7))],
+                       /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,6--2,7)),
+                    Lambda
+                      (false, true,
+                       SimplePats
+                         ([Id
+                             (b, None, false, false, false,
+                              /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,8--2,9))],
+                          /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,8--2,9)),
+                       Ident x, None,
+                       /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--2,14),
+                       { ArrowRange =
+                          Some
+                            /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,10--2,12) }),
+                    None,
+                    /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--2,14),
+                    { ArrowRange =
+                       Some
+                         /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,10--2,12) }),
+                 Some
+                   ([Named
+                       (SynIdent (a, None), false, None,
+                        /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,4--2,5));
+                     Wild
+                       /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,6--2,7);
+                     Named
+                       (SynIdent (b, None), false, None,
+                        /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,8--2,9))],
+                    Ident x),
+                 /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--2,14),
+                 { ArrowRange =
+                    Some
+                      /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,10--2,12) }),
+              /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--2,14))],
+          PreXmlDocEmpty, [], None,
+          /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs
rename to tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs
diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
new file mode 100644
index 00000000000..2f0ac32a468
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
@@ -0,0 +1,62 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs",
+      false,
+      QualifiedNameOfFile LambdaWithWildCardThatReturnsALambdaGivesCorrectBody,
+      [], [],
+      [SynModuleOrNamespace
+         ([LambdaWithWildCardThatReturnsALambdaGivesCorrectBody], false,
+          AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (_arg2, None, true, false, false,
+                        /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,4--2,5))],
+                    /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,4--2,5)),
+                 Lambda
+                   (false, false,
+                    SimplePats
+                      ([Id
+                          (_arg1, None, true, false, false,
+                           /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14))],
+                       /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14)),
+                    Ident x,
+                    Some
+                      ([Wild
+                          /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14)],
+                       Ident x),
+                    /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,9--2,19),
+                    { ArrowRange =
+                       Some
+                         /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,15--2,17) }),
+                 Some
+                   ([Wild
+                       /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,4--2,5)],
+                    Lambda
+                      (false, false,
+                       SimplePats
+                         ([Id
+                             (_arg1, None, true, false, false,
+                              /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14))],
+                          /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14)),
+                       Ident x,
+                       Some
+                         ([Wild
+                             /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14)],
+                          Ident x),
+                       /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,9--2,19),
+                       { ArrowRange =
+                          Some
+                            /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,15--2,17) })),
+                 /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,0--2,19),
+                 { ArrowRange =
+                    Some
+                      /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,6--2,8) }),
+              /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,0--2,19))],
+          PreXmlDocEmpty, [], None,
+          /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs
rename to tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs
diff --git a/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs.bsl
rename to tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl
index ad36e6bce11..7b615564c46 100644
--- a/tests/service/data/SyntaxTree/MultilineLambdaHasArrowRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/MultilineLambdaHasArrowRange.fs", false,
+     ("/root/Lambda/MultilineLambdaHasArrowRange.fs", false,
       QualifiedNameOfFile MultilineLambdaHasArrowRange, [], [],
       [SynModuleOrNamespace
          ([MultilineLambdaHasArrowRange], false, AnonModule,
@@ -10,22 +10,22 @@ ImplFile
                  SimplePats
                    ([Id
                        (x, None, false, false, false,
-                        /root/MultilineLambdaHasArrowRange.fs (2,4--2,5))],
-                    /root/MultilineLambdaHasArrowRange.fs (2,4--2,5)),
+                        /root/Lambda/MultilineLambdaHasArrowRange.fs (2,4--2,5))],
+                    /root/Lambda/MultilineLambdaHasArrowRange.fs (2,4--2,5)),
                  Lambda
                    (false, true,
                     SimplePats
                       ([Id
                           (y, None, false, false, false,
-                           /root/MultilineLambdaHasArrowRange.fs (2,6--2,7))],
-                       /root/MultilineLambdaHasArrowRange.fs (2,6--2,7)),
+                           /root/Lambda/MultilineLambdaHasArrowRange.fs (2,6--2,7))],
+                       /root/Lambda/MultilineLambdaHasArrowRange.fs (2,6--2,7)),
                     Lambda
                       (false, true,
                        SimplePats
                          ([Id
                              (z, None, false, false, false,
-                              /root/MultilineLambdaHasArrowRange.fs (2,8--2,9))],
-                          /root/MultilineLambdaHasArrowRange.fs (2,8--2,9)),
+                              /root/Lambda/MultilineLambdaHasArrowRange.fs (2,8--2,9))],
+                          /root/Lambda/MultilineLambdaHasArrowRange.fs (2,8--2,9)),
                        App
                          (NonAtomic, false,
                           App
@@ -35,7 +35,7 @@ ImplFile
                                 SynLongIdent
                                   ([op_Multiply], [],
                                    [Some (OriginalNotation "*")]), None,
-                                /root/MultilineLambdaHasArrowRange.fs (4,38--4,39)),
+                                /root/Lambda/MultilineLambdaHasArrowRange.fs (4,38--4,39)),
                              App
                                (NonAtomic, false,
                                 App
@@ -45,31 +45,34 @@ ImplFile
                                       SynLongIdent
                                         ([op_Multiply], [],
                                          [Some (OriginalNotation "*")]), None,
-                                      /root/MultilineLambdaHasArrowRange.fs (4,34--4,35)),
+                                      /root/Lambda/MultilineLambdaHasArrowRange.fs (4,34--4,35)),
                                    Ident x,
-                                   /root/MultilineLambdaHasArrowRange.fs (4,32--4,35)),
+                                   /root/Lambda/MultilineLambdaHasArrowRange.fs (4,32--4,35)),
                                 Ident y,
-                                /root/MultilineLambdaHasArrowRange.fs (4,32--4,37)),
-                             /root/MultilineLambdaHasArrowRange.fs (4,32--4,39)),
+                                /root/Lambda/MultilineLambdaHasArrowRange.fs (4,32--4,37)),
+                             /root/Lambda/MultilineLambdaHasArrowRange.fs (4,32--4,39)),
                           Ident z,
-                          /root/MultilineLambdaHasArrowRange.fs (4,32--4,41)),
-                       None, /root/MultilineLambdaHasArrowRange.fs (2,0--4,41),
+                          /root/Lambda/MultilineLambdaHasArrowRange.fs (4,32--4,41)),
+                       None,
+                       /root/Lambda/MultilineLambdaHasArrowRange.fs (2,0--4,41),
                        { ArrowRange =
                           Some
-                            /root/MultilineLambdaHasArrowRange.fs (3,28--3,30) }),
-                    None, /root/MultilineLambdaHasArrowRange.fs (2,0--4,41),
+                            /root/Lambda/MultilineLambdaHasArrowRange.fs (3,28--3,30) }),
+                    None,
+                    /root/Lambda/MultilineLambdaHasArrowRange.fs (2,0--4,41),
                     { ArrowRange =
-                       Some /root/MultilineLambdaHasArrowRange.fs (3,28--3,30) }),
+                       Some
+                         /root/Lambda/MultilineLambdaHasArrowRange.fs (3,28--3,30) }),
                  Some
                    ([Named
                        (SynIdent (x, None), false, None,
-                        /root/MultilineLambdaHasArrowRange.fs (2,4--2,5));
+                        /root/Lambda/MultilineLambdaHasArrowRange.fs (2,4--2,5));
                      Named
                        (SynIdent (y, None), false, None,
-                        /root/MultilineLambdaHasArrowRange.fs (2,6--2,7));
+                        /root/Lambda/MultilineLambdaHasArrowRange.fs (2,6--2,7));
                      Named
                        (SynIdent (z, None), false, None,
-                        /root/MultilineLambdaHasArrowRange.fs (2,8--2,9))],
+                        /root/Lambda/MultilineLambdaHasArrowRange.fs (2,8--2,9))],
                     App
                       (NonAtomic, false,
                        App
@@ -79,7 +82,7 @@ ImplFile
                              SynLongIdent
                                ([op_Multiply], [], [Some (OriginalNotation "*")]),
                              None,
-                             /root/MultilineLambdaHasArrowRange.fs (4,38--4,39)),
+                             /root/Lambda/MultilineLambdaHasArrowRange.fs (4,38--4,39)),
                           App
                             (NonAtomic, false,
                              App
@@ -89,20 +92,21 @@ ImplFile
                                    SynLongIdent
                                      ([op_Multiply], [],
                                       [Some (OriginalNotation "*")]), None,
-                                   /root/MultilineLambdaHasArrowRange.fs (4,34--4,35)),
+                                   /root/Lambda/MultilineLambdaHasArrowRange.fs (4,34--4,35)),
                                 Ident x,
-                                /root/MultilineLambdaHasArrowRange.fs (4,32--4,35)),
+                                /root/Lambda/MultilineLambdaHasArrowRange.fs (4,32--4,35)),
                              Ident y,
-                             /root/MultilineLambdaHasArrowRange.fs (4,32--4,37)),
-                          /root/MultilineLambdaHasArrowRange.fs (4,32--4,39)),
+                             /root/Lambda/MultilineLambdaHasArrowRange.fs (4,32--4,37)),
+                          /root/Lambda/MultilineLambdaHasArrowRange.fs (4,32--4,39)),
                        Ident z,
-                       /root/MultilineLambdaHasArrowRange.fs (4,32--4,41))),
-                 /root/MultilineLambdaHasArrowRange.fs (2,0--4,41),
+                       /root/Lambda/MultilineLambdaHasArrowRange.fs (4,32--4,41))),
+                 /root/Lambda/MultilineLambdaHasArrowRange.fs (2,0--4,41),
                  { ArrowRange =
-                    Some /root/MultilineLambdaHasArrowRange.fs (3,28--3,30) }),
-              /root/MultilineLambdaHasArrowRange.fs (2,0--4,41))],
+                    Some
+                      /root/Lambda/MultilineLambdaHasArrowRange.fs (3,28--3,30) }),
+              /root/Lambda/MultilineLambdaHasArrowRange.fs (2,0--4,41))],
           PreXmlDocEmpty, [], None,
-          /root/MultilineLambdaHasArrowRange.fs (2,0--5,0),
+          /root/Lambda/MultilineLambdaHasArrowRange.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs
rename to tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs
diff --git a/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl
new file mode 100644
index 00000000000..150c0a48a50
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl
@@ -0,0 +1,29 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Lambda/SimpleLambdaHasArrowRange.fs", false,
+      QualifiedNameOfFile SimpleLambdaHasArrowRange, [], [],
+      [SynModuleOrNamespace
+         ([SimpleLambdaHasArrowRange], false, AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (x, None, false, false, false,
+                        /root/Lambda/SimpleLambdaHasArrowRange.fs (2,4--2,5))],
+                    /root/Lambda/SimpleLambdaHasArrowRange.fs (2,4--2,5)),
+                 Ident x,
+                 Some
+                   ([Named
+                       (SynIdent (x, None), false, None,
+                        /root/Lambda/SimpleLambdaHasArrowRange.fs (2,4--2,5))],
+                    Ident x),
+                 /root/Lambda/SimpleLambdaHasArrowRange.fs (2,0--2,10),
+                 { ArrowRange =
+                    Some /root/Lambda/SimpleLambdaHasArrowRange.fs (2,6--2,8) }),
+              /root/Lambda/SimpleLambdaHasArrowRange.fs (2,0--2,10))],
+          PreXmlDocEmpty, [], None,
+          /root/Lambda/SimpleLambdaHasArrowRange.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs b/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs
rename to tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs
diff --git a/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl
new file mode 100644
index 00000000000..891e407f618
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl
@@ -0,0 +1,69 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Lambda/TupleInLambdaHasArrowRange.fs", false,
+      QualifiedNameOfFile TupleInLambdaHasArrowRange, [], [],
+      [SynModuleOrNamespace
+         ([TupleInLambdaHasArrowRange], false, AnonModule,
+          [Expr
+             (Lambda
+                (false, false,
+                 SimplePats
+                   ([Id
+                       (x, None, false, false, false,
+                        /root/Lambda/TupleInLambdaHasArrowRange.fs (2,5--2,6));
+                     Id
+                       (_arg1, None, true, false, false,
+                        /root/Lambda/TupleInLambdaHasArrowRange.fs (2,8--2,9))],
+                    /root/Lambda/TupleInLambdaHasArrowRange.fs (2,4--2,10)),
+                 App
+                   (NonAtomic, false,
+                    App
+                      (NonAtomic, true,
+                       LongIdent
+                         (false,
+                          SynLongIdent
+                            ([op_Multiply], [], [Some (OriginalNotation "*")]),
+                          None,
+                          /root/Lambda/TupleInLambdaHasArrowRange.fs (2,16--2,17)),
+                       Ident x,
+                       /root/Lambda/TupleInLambdaHasArrowRange.fs (2,14--2,17)),
+                    Const
+                      (Int32 3,
+                       /root/Lambda/TupleInLambdaHasArrowRange.fs (2,18--2,19)),
+                    /root/Lambda/TupleInLambdaHasArrowRange.fs (2,14--2,19)),
+                 Some
+                   ([Paren
+                       (Tuple
+                          (false,
+                           [Named
+                              (SynIdent (x, None), false, None,
+                               /root/Lambda/TupleInLambdaHasArrowRange.fs (2,5--2,6));
+                            Wild
+                              /root/Lambda/TupleInLambdaHasArrowRange.fs (2,8--2,9)],
+                           /root/Lambda/TupleInLambdaHasArrowRange.fs (2,5--2,9)),
+                        /root/Lambda/TupleInLambdaHasArrowRange.fs (2,4--2,10))],
+                    App
+                      (NonAtomic, false,
+                       App
+                         (NonAtomic, true,
+                          LongIdent
+                            (false,
+                             SynLongIdent
+                               ([op_Multiply], [], [Some (OriginalNotation "*")]),
+                             None,
+                             /root/Lambda/TupleInLambdaHasArrowRange.fs (2,16--2,17)),
+                          Ident x,
+                          /root/Lambda/TupleInLambdaHasArrowRange.fs (2,14--2,17)),
+                       Const
+                         (Int32 3,
+                          /root/Lambda/TupleInLambdaHasArrowRange.fs (2,18--2,19)),
+                       /root/Lambda/TupleInLambdaHasArrowRange.fs (2,14--2,19))),
+                 /root/Lambda/TupleInLambdaHasArrowRange.fs (2,0--2,19),
+                 { ArrowRange =
+                    Some /root/Lambda/TupleInLambdaHasArrowRange.fs (2,11--2,13) }),
+              /root/Lambda/TupleInLambdaHasArrowRange.fs (2,0--2,19))],
+          PreXmlDocEmpty, [], None,
+          /root/Lambda/TupleInLambdaHasArrowRange.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
deleted file mode 100644
index 3ce6336d488..00000000000
--- a/tests/service/data/SyntaxTree/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
+++ /dev/null
@@ -1,71 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs", false,
-      QualifiedNameOfFile LambdaWithTupleParameterWithWildCardGivesCorrectBody,
-      [], [],
-      [SynModuleOrNamespace
-         ([LambdaWithTupleParameterWithWildCardGivesCorrectBody], false,
-          AnonModule,
-          [Expr
-             (Lambda
-                (false, false,
-                 SimplePats
-                   ([Id
-                       (a, None, false, false, false,
-                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,4--2,5))],
-                    /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,4--2,5)),
-                 Lambda
-                   (false, true,
-                    SimplePats
-                      ([Id
-                          (b, None, false, false, false,
-                           /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,7--2,8));
-                        Id
-                          (_arg1, None, true, false, false,
-                           /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,10--2,11))],
-                       /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,6--2,12)),
-                    Lambda
-                      (false, true,
-                       SimplePats
-                         ([Id
-                             (c, None, false, false, false,
-                              /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,13--2,14))],
-                          /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,13--2,14)),
-                       Ident x, None,
-                       /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--2,19),
-                       { ArrowRange =
-                          Some
-                            /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,15--2,17) }),
-                    None,
-                    /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--2,19),
-                    { ArrowRange =
-                       Some
-                         /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,15--2,17) }),
-                 Some
-                   ([Named
-                       (SynIdent (a, None), false, None,
-                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,4--2,5));
-                     Paren
-                       (Tuple
-                          (false,
-                           [Named
-                              (SynIdent (b, None), false, None,
-                               /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,7--2,8));
-                            Wild
-                              /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,10--2,11)],
-                           /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,7--2,11)),
-                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,6--2,12));
-                     Named
-                       (SynIdent (c, None), false, None,
-                        /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,13--2,14))],
-                    Ident x),
-                 /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--2,19),
-                 { ArrowRange =
-                    Some
-                      /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,15--2,17) }),
-              /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--2,19))],
-          PreXmlDocEmpty, [], None,
-          /root/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
deleted file mode 100644
index df21d31cf02..00000000000
--- a/tests/service/data/SyntaxTree/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
+++ /dev/null
@@ -1,44 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/LambdaWithTwoParametersGivesCorrectBody.fs", false,
-      QualifiedNameOfFile LambdaWithTwoParametersGivesCorrectBody, [], [],
-      [SynModuleOrNamespace
-         ([LambdaWithTwoParametersGivesCorrectBody], false, AnonModule,
-          [Expr
-             (Lambda
-                (false, false,
-                 SimplePats
-                   ([Id
-                       (a, None, false, false, false,
-                        /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,4--2,5))],
-                    /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,4--2,5)),
-                 Lambda
-                   (false, true,
-                    SimplePats
-                      ([Id
-                          (b, None, false, false, false,
-                           /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,6--2,7))],
-                       /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,6--2,7)),
-                    Ident x, None,
-                    /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,0--2,12),
-                    { ArrowRange =
-                       Some
-                         /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,8--2,10) }),
-                 Some
-                   ([Named
-                       (SynIdent (a, None), false, None,
-                        /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,4--2,5));
-                     Named
-                       (SynIdent (b, None), false, None,
-                        /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,6--2,7))],
-                    Ident x),
-                 /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,0--2,12),
-                 { ArrowRange =
-                    Some
-                      /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,8--2,10) }),
-              /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,0--2,12))],
-          PreXmlDocEmpty, [], None,
-          /root/LambdaWithTwoParametersGivesCorrectBody.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
deleted file mode 100644
index 4d47ea40bc2..00000000000
--- a/tests/service/data/SyntaxTree/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
+++ /dev/null
@@ -1,58 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/LambdaWithWildCardParameterGivesCorrectBody.fs", false,
-      QualifiedNameOfFile LambdaWithWildCardParameterGivesCorrectBody, [], [],
-      [SynModuleOrNamespace
-         ([LambdaWithWildCardParameterGivesCorrectBody], false, AnonModule,
-          [Expr
-             (Lambda
-                (false, false,
-                 SimplePats
-                   ([Id
-                       (a, None, false, false, false,
-                        /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,4--2,5))],
-                    /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,4--2,5)),
-                 Lambda
-                   (false, true,
-                    SimplePats
-                      ([Id
-                          (_arg1, None, true, false, false,
-                           /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,6--2,7))],
-                       /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,6--2,7)),
-                    Lambda
-                      (false, true,
-                       SimplePats
-                         ([Id
-                             (b, None, false, false, false,
-                              /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,8--2,9))],
-                          /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,8--2,9)),
-                       Ident x, None,
-                       /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--2,14),
-                       { ArrowRange =
-                          Some
-                            /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,10--2,12) }),
-                    None,
-                    /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--2,14),
-                    { ArrowRange =
-                       Some
-                         /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,10--2,12) }),
-                 Some
-                   ([Named
-                       (SynIdent (a, None), false, None,
-                        /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,4--2,5));
-                     Wild
-                       /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,6--2,7);
-                     Named
-                       (SynIdent (b, None), false, None,
-                        /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,8--2,9))],
-                    Ident x),
-                 /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--2,14),
-                 { ArrowRange =
-                    Some
-                      /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,10--2,12) }),
-              /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--2,14))],
-          PreXmlDocEmpty, [], None,
-          /root/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
deleted file mode 100644
index d349bc2a2ee..00000000000
--- a/tests/service/data/SyntaxTree/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
+++ /dev/null
@@ -1,61 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs", false,
-      QualifiedNameOfFile LambdaWithWildCardThatReturnsALambdaGivesCorrectBody,
-      [], [],
-      [SynModuleOrNamespace
-         ([LambdaWithWildCardThatReturnsALambdaGivesCorrectBody], false,
-          AnonModule,
-          [Expr
-             (Lambda
-                (false, false,
-                 SimplePats
-                   ([Id
-                       (_arg2, None, true, false, false,
-                        /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,4--2,5))],
-                    /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,4--2,5)),
-                 Lambda
-                   (false, false,
-                    SimplePats
-                      ([Id
-                          (_arg1, None, true, false, false,
-                           /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14))],
-                       /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14)),
-                    Ident x,
-                    Some
-                      ([Wild
-                          /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14)],
-                       Ident x),
-                    /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,9--2,19),
-                    { ArrowRange =
-                       Some
-                         /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,15--2,17) }),
-                 Some
-                   ([Wild
-                       /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,4--2,5)],
-                    Lambda
-                      (false, false,
-                       SimplePats
-                         ([Id
-                             (_arg1, None, true, false, false,
-                              /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14))],
-                          /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14)),
-                       Ident x,
-                       Some
-                         ([Wild
-                             /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,13--2,14)],
-                          Ident x),
-                       /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,9--2,19),
-                       { ArrowRange =
-                          Some
-                            /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,15--2,17) })),
-                 /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,0--2,19),
-                 { ArrowRange =
-                    Some
-                      /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,6--2,8) }),
-              /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,0--2,19))],
-          PreXmlDocEmpty, [], None,
-          /root/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AbstractKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/AbstractKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs
diff --git a/tests/service/data/SyntaxTree/AbstractKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl
similarity index 57%
rename from tests/service/data/SyntaxTree/AbstractKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl
index 7d45c4f1bd8..638d06e413e 100644
--- a/tests/service/data/SyntaxTree/AbstractKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl
@@ -1,7 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/AbstractKeyword.fs", false, QualifiedNameOfFile AbstractKeyword, [],
-      [],
+     ("/root/LeadingKeyword/AbstractKeyword.fs", false,
+      QualifiedNameOfFile AbstractKeyword, [], [],
       [SynModuleOrNamespace
          ([AbstractKeyword], false, AnonModule,
           [Types
@@ -9,7 +9,8 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/AbstractKeyword.fs (2,5--2,6)),
+                     false, None,
+                     /root/LeadingKeyword/AbstractKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AbstractSlot
@@ -20,9 +21,11 @@ ImplFile
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            None, None, /root/AbstractKeyword.fs (3,4--3,20),
+                            None, None,
+                            /root/LeadingKeyword/AbstractKeyword.fs (3,4--3,20),
                             { LeadingKeyword =
-                               Abstract /root/AbstractKeyword.fs (3,4--3,12)
+                               Abstract
+                                 /root/LeadingKeyword/AbstractKeyword.fs (3,4--3,12)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -32,14 +35,18 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/AbstractKeyword.fs (3,4--3,20),
+                         /root/LeadingKeyword/AbstractKeyword.fs (3,4--3,20),
                          { GetSetKeywords = None })],
-                     /root/AbstractKeyword.fs (3,4--3,20)), [], None,
-                  /root/AbstractKeyword.fs (2,5--3,20),
-                  { LeadingKeyword = Type /root/AbstractKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/AbstractKeyword.fs (2,7--2,8)
-                    WithKeyword = None })], /root/AbstractKeyword.fs (2,0--3,20))],
-          PreXmlDocEmpty, [], None, /root/AbstractKeyword.fs (2,0--4,0),
+                     /root/LeadingKeyword/AbstractKeyword.fs (3,4--3,20)), [],
+                  None, /root/LeadingKeyword/AbstractKeyword.fs (2,5--3,20),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/AbstractKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/AbstractKeyword.fs (2,7--2,8)
+                    WithKeyword = None })],
+              /root/LeadingKeyword/AbstractKeyword.fs (2,0--3,20))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/AbstractKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/AbstractMemberKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs
diff --git a/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl
similarity index 60%
rename from tests/service/data/SyntaxTree/AbstractMemberKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl
index 5f5178c1b72..6381235b8e8 100644
--- a/tests/service/data/SyntaxTree/AbstractMemberKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/AbstractMemberKeyword.fs", false,
+     ("/root/LeadingKeyword/AbstractMemberKeyword.fs", false,
       QualifiedNameOfFile AbstractMemberKeyword, [], [],
       [SynModuleOrNamespace
          ([AbstractMemberKeyword], false, AnonModule,
@@ -9,7 +9,8 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/AbstractMemberKeyword.fs (2,5--2,6)),
+                     false, None,
+                     /root/LeadingKeyword/AbstractMemberKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AbstractSlot
@@ -21,11 +22,11 @@ ImplFile
                             false,
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/AbstractMemberKeyword.fs (3,4--3,27),
+                            /root/LeadingKeyword/AbstractMemberKeyword.fs (3,4--3,27),
                             { LeadingKeyword =
                                AbstractMember
-                                 (/root/AbstractMemberKeyword.fs (3,4--3,12),
-                                  /root/AbstractMemberKeyword.fs (3,13--3,19))
+                                 (/root/LeadingKeyword/AbstractMemberKeyword.fs (3,4--3,12),
+                                  /root/LeadingKeyword/AbstractMemberKeyword.fs (3,13--3,19))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -35,16 +36,21 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/AbstractMemberKeyword.fs (3,4--3,27),
+                         /root/LeadingKeyword/AbstractMemberKeyword.fs (3,4--3,27),
                          { GetSetKeywords = None })],
-                     /root/AbstractMemberKeyword.fs (3,4--3,27)), [], None,
-                  /root/AbstractMemberKeyword.fs (2,5--3,27),
+                     /root/LeadingKeyword/AbstractMemberKeyword.fs (3,4--3,27)),
+                  [], None,
+                  /root/LeadingKeyword/AbstractMemberKeyword.fs (2,5--3,27),
                   { LeadingKeyword =
-                     Type /root/AbstractMemberKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/AbstractMemberKeyword.fs (2,7--2,8)
+                     Type
+                       /root/LeadingKeyword/AbstractMemberKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/LeadingKeyword/AbstractMemberKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/AbstractMemberKeyword.fs (2,0--3,27))], PreXmlDocEmpty, [],
-          None, /root/AbstractMemberKeyword.fs (2,0--4,0),
+              /root/LeadingKeyword/AbstractMemberKeyword.fs (2,0--3,27))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/AbstractMemberKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AndKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/AndKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs
diff --git a/tests/service/data/SyntaxTree/AndKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl
similarity index 50%
rename from tests/service/data/SyntaxTree/AndKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl
index 9963f81c43d..1f69663b4dc 100644
--- a/tests/service/data/SyntaxTree/AndKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/AndKeyword.fs", false, QualifiedNameOfFile AndKeyword, [], [],
+     ("/root/LeadingKeyword/AndKeyword.fs", false,
+      QualifiedNameOfFile AndKeyword, [], [],
       [SynModuleOrNamespace
          ([AndKeyword], false, AnonModule,
           [Let
@@ -18,8 +19,8 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (b, None), false, None,
-                           /root/AndKeyword.fs (2,10--2,11))], None,
-                     /root/AndKeyword.fs (2,8--2,11)), None,
+                           /root/LeadingKeyword/AndKeyword.fs (2,10--2,11))],
+                     None, /root/LeadingKeyword/AndKeyword.fs (2,8--2,11)), None,
                   App
                     (NonAtomic, false,
                      App
@@ -28,17 +29,19 @@ ImplFile
                           (false,
                            SynLongIdent
                              ([op_Addition], [], [Some (OriginalNotation "+")]),
-                           None, /root/AndKeyword.fs (2,16--2,17)), Ident b,
-                        /root/AndKeyword.fs (2,14--2,17)),
-                     Const (Int32 1, /root/AndKeyword.fs (2,18--2,19)),
-                     /root/AndKeyword.fs (2,14--2,19)),
-                  /root/AndKeyword.fs (2,8--2,11), NoneAtLet,
+                           None, /root/LeadingKeyword/AndKeyword.fs (2,16--2,17)),
+                        Ident b, /root/LeadingKeyword/AndKeyword.fs (2,14--2,17)),
+                     Const
+                       (Int32 1, /root/LeadingKeyword/AndKeyword.fs (2,18--2,19)),
+                     /root/LeadingKeyword/AndKeyword.fs (2,14--2,19)),
+                  /root/LeadingKeyword/AndKeyword.fs (2,8--2,11), NoneAtLet,
                   { LeadingKeyword =
                      LetRec
-                       (/root/AndKeyword.fs (2,0--2,3),
-                        /root/AndKeyword.fs (2,4--2,7))
+                       (/root/LeadingKeyword/AndKeyword.fs (2,0--2,3),
+                        /root/LeadingKeyword/AndKeyword.fs (2,4--2,7))
                     InlineKeyword = None
-                    EqualsRange = Some /root/AndKeyword.fs (2,12--2,13) });
+                    EqualsRange =
+                     Some /root/LeadingKeyword/AndKeyword.fs (2,12--2,13) });
                SynBinding
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
@@ -52,8 +55,8 @@ ImplFile
                      Pats
                        [Named
                           (SynIdent (e, None), false, None,
-                           /root/AndKeyword.fs (3,6--3,7))], None,
-                     /root/AndKeyword.fs (3,4--3,7)), None,
+                           /root/LeadingKeyword/AndKeyword.fs (3,6--3,7))], None,
+                     /root/LeadingKeyword/AndKeyword.fs (3,4--3,7)), None,
                   App
                     (NonAtomic, false,
                      App
@@ -62,15 +65,19 @@ ImplFile
                           (false,
                            SynLongIdent
                              ([op_Addition], [], [Some (OriginalNotation "+")]),
-                           None, /root/AndKeyword.fs (3,12--3,13)), Ident e,
-                        /root/AndKeyword.fs (3,10--3,13)),
-                     Const (Int32 1, /root/AndKeyword.fs (3,14--3,15)),
-                     /root/AndKeyword.fs (3,10--3,15)),
-                  /root/AndKeyword.fs (3,4--3,7), NoneAtLet,
-                  { LeadingKeyword = And /root/AndKeyword.fs (3,0--3,3)
+                           None, /root/LeadingKeyword/AndKeyword.fs (3,12--3,13)),
+                        Ident e, /root/LeadingKeyword/AndKeyword.fs (3,10--3,13)),
+                     Const
+                       (Int32 1, /root/LeadingKeyword/AndKeyword.fs (3,14--3,15)),
+                     /root/LeadingKeyword/AndKeyword.fs (3,10--3,15)),
+                  /root/LeadingKeyword/AndKeyword.fs (3,4--3,7), NoneAtLet,
+                  { LeadingKeyword =
+                     And /root/LeadingKeyword/AndKeyword.fs (3,0--3,3)
                     InlineKeyword = None
-                    EqualsRange = Some /root/AndKeyword.fs (3,8--3,9) })],
-              /root/AndKeyword.fs (2,0--3,15))], PreXmlDocEmpty, [], None,
-          /root/AndKeyword.fs (2,0--4,0), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
+                    EqualsRange =
+                     Some /root/LeadingKeyword/AndKeyword.fs (3,8--3,9) })],
+              /root/LeadingKeyword/AndKeyword.fs (2,0--3,15))], PreXmlDocEmpty,
+          [], None, /root/LeadingKeyword/AndKeyword.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DefaultKeyword.fsi b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/DefaultKeyword.fsi
rename to tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi
diff --git a/tests/service/data/SyntaxTree/DefaultKeyword.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/DefaultKeyword.fsi.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl
index c132c25ae15..1ec8bc239b1 100644
--- a/tests/service/data/SyntaxTree/DefaultKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl
@@ -1,6 +1,7 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/DefaultKeyword.fsi", QualifiedNameOfFile DefaultKeyword, [], [],
+     ("/root/LeadingKeyword/DefaultKeyword.fsi",
+      QualifiedNameOfFile DefaultKeyword, [], [],
       [SynModuleOrNamespaceSig
          ([X], false, DeclaredNamespace,
           [Types
@@ -8,7 +9,8 @@ SigFile
                  (SynComponentInfo
                     ([], None, [], [Y],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/DefaultKeyword.fsi (4,5--4,6)),
+                     false, None,
+                     /root/LeadingKeyword/DefaultKeyword.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -19,9 +21,11 @@ SigFile
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
                             PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            None, None, /root/DefaultKeyword.fsi (5,4--5,19),
+                            None, None,
+                            /root/LeadingKeyword/DefaultKeyword.fsi (5,4--5,19),
                             { LeadingKeyword =
-                               Default /root/DefaultKeyword.fsi (5,4--5,11)
+                               Default
+                                 /root/LeadingKeyword/DefaultKeyword.fsi (5,4--5,11)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -31,14 +35,19 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/DefaultKeyword.fsi (5,4--5,19),
+                         /root/LeadingKeyword/DefaultKeyword.fsi (5,4--5,19),
                          { GetSetKeywords = None })],
-                     /root/DefaultKeyword.fsi (5,4--5,19)), [],
-                  /root/DefaultKeyword.fsi (4,5--5,19),
-                  { LeadingKeyword = Type /root/DefaultKeyword.fsi (4,0--4,4)
-                    EqualsRange = Some /root/DefaultKeyword.fsi (4,7--4,8)
-                    WithKeyword = None })], /root/DefaultKeyword.fsi (4,0--5,19))],
-          PreXmlDocEmpty, [], None, /root/DefaultKeyword.fsi (2,0--5,19),
-          { LeadingKeyword = Namespace /root/DefaultKeyword.fsi (2,0--2,9) })],
+                     /root/LeadingKeyword/DefaultKeyword.fsi (5,4--5,19)), [],
+                  /root/LeadingKeyword/DefaultKeyword.fsi (4,5--5,19),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/DefaultKeyword.fsi (4,0--4,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/DefaultKeyword.fsi (4,7--4,8)
+                    WithKeyword = None })],
+              /root/LeadingKeyword/DefaultKeyword.fsi (4,0--5,19))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/DefaultKeyword.fsi (2,0--5,19),
+          { LeadingKeyword =
+             Namespace /root/LeadingKeyword/DefaultKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DefaultValKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/DefaultValKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs
diff --git a/tests/service/data/SyntaxTree/DefaultValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/DefaultValKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl
index b84c41e7a72..36c79fb7c7e 100644
--- a/tests/service/data/SyntaxTree/DefaultValKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl
@@ -1,7 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/DefaultValKeyword.fs", false, QualifiedNameOfFile DefaultValKeyword,
-      [], [],
+     ("/root/LeadingKeyword/DefaultValKeyword.fs", false,
+      QualifiedNameOfFile DefaultValKeyword, [], [],
       [SynModuleOrNamespace
          ([DefaultValKeyword], false, AnonModule,
           [Types
@@ -9,7 +9,8 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/DefaultValKeyword.fs (2,5--2,8)),
+                     false, None,
+                     /root/LeadingKeyword/DefaultValKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [AutoProperty
@@ -30,22 +31,28 @@ ImplFile
                          PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None,
                          Const
-                           (Int32 1, /root/DefaultValKeyword.fs (3,26--3,27)),
-                         /root/DefaultValKeyword.fs (3,4--3,27),
+                           (Int32 1,
+                            /root/LeadingKeyword/DefaultValKeyword.fs (3,26--3,27)),
+                         /root/LeadingKeyword/DefaultValKeyword.fs (3,4--3,27),
                          { LeadingKeyword =
                             DefaultVal
-                              (/root/DefaultValKeyword.fs (3,4--3,11),
-                               /root/DefaultValKeyword.fs (3,12--3,15))
+                              (/root/LeadingKeyword/DefaultValKeyword.fs (3,4--3,11),
+                               /root/LeadingKeyword/DefaultValKeyword.fs (3,12--3,15))
                            WithKeyword = None
                            EqualsRange =
-                            Some /root/DefaultValKeyword.fs (3,24--3,25)
+                            Some
+                              /root/LeadingKeyword/DefaultValKeyword.fs (3,24--3,25)
                            GetSetKeywords = None })],
-                     /root/DefaultValKeyword.fs (3,4--3,27)), [], None,
-                  /root/DefaultValKeyword.fs (2,5--3,27),
-                  { LeadingKeyword = Type /root/DefaultValKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/DefaultValKeyword.fs (2,9--2,10)
+                     /root/LeadingKeyword/DefaultValKeyword.fs (3,4--3,27)), [],
+                  None, /root/LeadingKeyword/DefaultValKeyword.fs (2,5--3,27),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/DefaultValKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/DefaultValKeyword.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/DefaultValKeyword.fs (2,0--3,27))], PreXmlDocEmpty, [], None,
-          /root/DefaultValKeyword.fs (2,0--4,0), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
+              /root/LeadingKeyword/DefaultValKeyword.fs (2,0--3,27))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/DefaultValKeyword.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DoKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/DoKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl
new file mode 100644
index 00000000000..2c8524528c2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl
@@ -0,0 +1,47 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LeadingKeyword/DoKeyword.fs", false, QualifiedNameOfFile DoKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([DoKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/LeadingKeyword/DoKeyword.fs (2,5--2,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [LetBindings
+                        ([SynBinding
+                            (None, Do, false, false, [], PreXmlDocEmpty,
+                             SynValData
+                               (None,
+                                SynValInfo ([], SynArgInfo ([], false, None)),
+                                None),
+                             Const
+                               (Unit,
+                                /root/LeadingKeyword/DoKeyword.fs (3,4--3,9)),
+                             None,
+                             Const
+                               (Unit,
+                                /root/LeadingKeyword/DoKeyword.fs (3,7--3,9)),
+                             /root/LeadingKeyword/DoKeyword.fs (3,4--3,9),
+                             NoneAtDo,
+                             { LeadingKeyword =
+                                Do /root/LeadingKeyword/DoKeyword.fs (3,4--3,6)
+                               InlineKeyword = None
+                               EqualsRange = None })], false, false,
+                         /root/LeadingKeyword/DoKeyword.fs (3,4--3,9))],
+                     /root/LeadingKeyword/DoKeyword.fs (3,4--3,9)), [], None,
+                  /root/LeadingKeyword/DoKeyword.fs (2,5--3,9),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/DoKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/DoKeyword.fs (2,7--2,8)
+                    WithKeyword = None })],
+              /root/LeadingKeyword/DoKeyword.fs (2,0--3,9))], PreXmlDocEmpty, [],
+          None, /root/LeadingKeyword/DoKeyword.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DoStaticKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/DoStaticKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl
new file mode 100644
index 00000000000..829b59aa1b4
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl
@@ -0,0 +1,51 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LeadingKeyword/DoStaticKeyword.fs", false,
+      QualifiedNameOfFile DoStaticKeyword, [], [],
+      [SynModuleOrNamespace
+         ([DoStaticKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/LeadingKeyword/DoStaticKeyword.fs (2,5--2,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [LetBindings
+                        ([SynBinding
+                            (None, Do, false, false, [], PreXmlDocEmpty,
+                             SynValData
+                               (None,
+                                SynValInfo ([], SynArgInfo ([], false, None)),
+                                None),
+                             Const
+                               (Unit,
+                                /root/LeadingKeyword/DoStaticKeyword.fs (3,11--3,16)),
+                             None,
+                             Const
+                               (Unit,
+                                /root/LeadingKeyword/DoStaticKeyword.fs (3,14--3,16)),
+                             /root/LeadingKeyword/DoStaticKeyword.fs (3,11--3,16),
+                             NoneAtDo,
+                             { LeadingKeyword =
+                                StaticDo
+                                  (/root/LeadingKeyword/DoStaticKeyword.fs (3,4--3,10),
+                                   /root/LeadingKeyword/DoStaticKeyword.fs (3,11--3,13))
+                               InlineKeyword = None
+                               EqualsRange = None })], true, false,
+                         /root/LeadingKeyword/DoStaticKeyword.fs (3,4--3,16))],
+                     /root/LeadingKeyword/DoStaticKeyword.fs (3,4--3,16)), [],
+                  None, /root/LeadingKeyword/DoStaticKeyword.fs (2,5--3,16),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/DoStaticKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/DoStaticKeyword.fs (2,7--2,8)
+                    WithKeyword = None })],
+              /root/LeadingKeyword/DoStaticKeyword.fs (2,0--3,16))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/DoStaticKeyword.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ExternKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ExternKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs
diff --git a/tests/service/data/SyntaxTree/ExternKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/ExternKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl
index 2a6ccc6add8..b4c7288b12c 100644
--- a/tests/service/data/SyntaxTree/ExternKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/ExternKeyword.fs", false, QualifiedNameOfFile ExternKeyword, [], [],
+     ("/root/LeadingKeyword/ExternKeyword.fs", false,
+      QualifiedNameOfFile ExternKeyword, [], [],
       [SynModuleOrNamespace
          ([ExternKeyword], false, AnonModule,
           [Let
@@ -14,8 +15,10 @@ ImplFile
                     (SynLongIdent ([Meh], [], [None]), None,
                      Some (SynValTyparDecls (None, false)),
                      Pats
-                       [Tuple (false, [], /root/ExternKeyword.fs (2,15--2,16))],
-                     None, /root/ExternKeyword.fs (2,12--2,15)),
+                       [Tuple
+                          (false, [],
+                           /root/LeadingKeyword/ExternKeyword.fs (2,15--2,16))],
+                     None, /root/LeadingKeyword/ExternKeyword.fs (2,12--2,15)),
                   Some
                     (SynBindingReturnInfo
                        (App
@@ -23,8 +26,8 @@ ImplFile
                              (SynLongIdent
                                 ([unit], [], [Some (OriginalNotation "void")])),
                            None, [], [], None, false,
-                           /root/ExternKeyword.fs (2,7--2,11)),
-                        /root/ExternKeyword.fs (2,7--2,11), [],
+                           /root/LeadingKeyword/ExternKeyword.fs (2,7--2,11)),
+                        /root/LeadingKeyword/ExternKeyword.fs (2,7--2,11), [],
                         { ColonRange = None })),
                   Typed
                     (App
@@ -32,21 +35,26 @@ ImplFile
                         Const
                           (String
                              ("extern was not given a DllImport attribute",
-                              Regular, /root/ExternKeyword.fs (2,16--2,17)),
-                           /root/ExternKeyword.fs (2,16--2,17)),
-                        /root/ExternKeyword.fs (2,0--2,17)),
+                              Regular,
+                              /root/LeadingKeyword/ExternKeyword.fs (2,16--2,17)),
+                           /root/LeadingKeyword/ExternKeyword.fs (2,16--2,17)),
+                        /root/LeadingKeyword/ExternKeyword.fs (2,0--2,17)),
                      App
                        (LongIdent
                           (SynLongIdent
                              ([unit], [], [Some (OriginalNotation "void")])),
                         None, [], [], None, false,
-                        /root/ExternKeyword.fs (2,7--2,11)),
-                     /root/ExternKeyword.fs (2,0--2,17)),
-                  /root/ExternKeyword.fs (2,0--2,17), NoneAtInvisible,
-                  { LeadingKeyword = Extern /root/ExternKeyword.fs (2,0--2,6)
+                        /root/LeadingKeyword/ExternKeyword.fs (2,7--2,11)),
+                     /root/LeadingKeyword/ExternKeyword.fs (2,0--2,17)),
+                  /root/LeadingKeyword/ExternKeyword.fs (2,0--2,17),
+                  NoneAtInvisible,
+                  { LeadingKeyword =
+                     Extern /root/LeadingKeyword/ExternKeyword.fs (2,0--2,6)
                     InlineKeyword = None
-                    EqualsRange = None })], /root/ExternKeyword.fs (2,0--2,17))],
-          PreXmlDocEmpty, [], None, /root/ExternKeyword.fs (2,0--2,17),
+                    EqualsRange = None })],
+              /root/LeadingKeyword/ExternKeyword.fs (2,0--2,17))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/ExternKeyword.fs (2,0--2,17),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LetKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/LetKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl
new file mode 100644
index 00000000000..1fe3eada239
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl
@@ -0,0 +1,47 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LeadingKeyword/LetKeyword.fs", false,
+      QualifiedNameOfFile LetKeyword, [], [],
+      [SynModuleOrNamespace
+         ([LetKeyword], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some b)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([a], [], [None]), None, None,
+                     Pats
+                       [Named
+                          (SynIdent (b, None), false, None,
+                           /root/LeadingKeyword/LetKeyword.fs (2,6--2,7))], None,
+                     /root/LeadingKeyword/LetKeyword.fs (2,4--2,7)), None,
+                  App
+                    (NonAtomic, false,
+                     App
+                       (NonAtomic, true,
+                        LongIdent
+                          (false,
+                           SynLongIdent
+                             ([op_Addition], [], [Some (OriginalNotation "+")]),
+                           None, /root/LeadingKeyword/LetKeyword.fs (2,12--2,13)),
+                        Ident b, /root/LeadingKeyword/LetKeyword.fs (2,10--2,13)),
+                     Const
+                       (Int32 1, /root/LeadingKeyword/LetKeyword.fs (2,14--2,15)),
+                     /root/LeadingKeyword/LetKeyword.fs (2,10--2,15)),
+                  /root/LeadingKeyword/LetKeyword.fs (2,4--2,7), NoneAtLet,
+                  { LeadingKeyword =
+                     Let /root/LeadingKeyword/LetKeyword.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some /root/LeadingKeyword/LetKeyword.fs (2,8--2,9) })],
+              /root/LeadingKeyword/LetKeyword.fs (2,0--2,15))], PreXmlDocEmpty,
+          [], None, /root/LeadingKeyword/LetKeyword.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LetRecKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/LetRecKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl
new file mode 100644
index 00000000000..0d86ce582b3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl
@@ -0,0 +1,54 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LeadingKeyword/LetRecKeyword.fs", false,
+      QualifiedNameOfFile LetRecKeyword, [], [],
+      [SynModuleOrNamespace
+         ([LetRecKeyword], false, AnonModule,
+          [Let
+             (true,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some b)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent ([a], [], [None]), None, None,
+                     Pats
+                       [Named
+                          (SynIdent (b, None), false, None,
+                           /root/LeadingKeyword/LetRecKeyword.fs (2,10--2,11))],
+                     None, /root/LeadingKeyword/LetRecKeyword.fs (2,8--2,11)),
+                  None,
+                  App
+                    (NonAtomic, false,
+                     App
+                       (NonAtomic, true,
+                        LongIdent
+                          (false,
+                           SynLongIdent
+                             ([op_Addition], [], [Some (OriginalNotation "+")]),
+                           None,
+                           /root/LeadingKeyword/LetRecKeyword.fs (2,16--2,17)),
+                        Ident b,
+                        /root/LeadingKeyword/LetRecKeyword.fs (2,14--2,17)),
+                     Const
+                       (Int32 1,
+                        /root/LeadingKeyword/LetRecKeyword.fs (2,18--2,19)),
+                     /root/LeadingKeyword/LetRecKeyword.fs (2,14--2,19)),
+                  /root/LeadingKeyword/LetRecKeyword.fs (2,8--2,11), NoneAtLet,
+                  { LeadingKeyword =
+                     LetRec
+                       (/root/LeadingKeyword/LetRecKeyword.fs (2,0--2,3),
+                        /root/LeadingKeyword/LetRecKeyword.fs (2,4--2,7))
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some /root/LeadingKeyword/LetRecKeyword.fs (2,12--2,13) })],
+              /root/LeadingKeyword/LetRecKeyword.fs (2,0--2,19))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/LetRecKeyword.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/MemberKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl
new file mode 100644
index 00000000000..0edebe00092
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl
@@ -0,0 +1,69 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LeadingKeyword/MemberKeyword.fs", false,
+      QualifiedNameOfFile MemberKeyword, [], [],
+      [SynModuleOrNamespace
+         ([MemberKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/LeadingKeyword/MemberKeyword.fs (2,5--2,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [Member
+                        (SynBinding
+                           (None, Normal, false, false, [],
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            SynValData
+                              (Some { IsInstance = true
+                                      IsDispatchSlot = false
+                                      IsOverrideOrExplicitImpl = false
+                                      IsFinal = false
+                                      GetterOrSetterIsCompilerGenerated = false
+                                      MemberKind = Member },
+                               SynValInfo
+                                 ([[SynArgInfo ([], false, None)]; []],
+                                  SynArgInfo ([], false, None)), None),
+                            LongIdent
+                              (SynLongIdent
+                                 ([this; Y],
+                                  [/root/LeadingKeyword/MemberKeyword.fs (3,15--3,16)],
+                                  [None; None]), None, None,
+                               Pats
+                                 [Paren
+                                    (Const
+                                       (Unit,
+                                        /root/LeadingKeyword/MemberKeyword.fs (3,18--3,20)),
+                                     /root/LeadingKeyword/MemberKeyword.fs (3,18--3,20))],
+                               None,
+                               /root/LeadingKeyword/MemberKeyword.fs (3,11--3,20)),
+                            None,
+                            Const
+                              (Unit,
+                               /root/LeadingKeyword/MemberKeyword.fs (3,24--3,26)),
+                            /root/LeadingKeyword/MemberKeyword.fs (3,11--3,20),
+                            NoneAtInvisible,
+                            { LeadingKeyword =
+                               Member
+                                 /root/LeadingKeyword/MemberKeyword.fs (3,4--3,10)
+                              InlineKeyword = None
+                              EqualsRange =
+                               Some
+                                 /root/LeadingKeyword/MemberKeyword.fs (3,22--3,23) }),
+                         /root/LeadingKeyword/MemberKeyword.fs (3,4--3,26))],
+                     /root/LeadingKeyword/MemberKeyword.fs (3,4--3,26)), [],
+                  None, /root/LeadingKeyword/MemberKeyword.fs (2,5--3,26),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/MemberKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/MemberKeyword.fs (2,7--2,8)
+                    WithKeyword = None })],
+              /root/LeadingKeyword/MemberKeyword.fs (2,0--3,26))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/MemberKeyword.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberValKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/MemberValKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs
diff --git a/tests/service/data/SyntaxTree/MemberValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/MemberValKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl
index 5a558f124d8..f5f8fac1278 100644
--- a/tests/service/data/SyntaxTree/MemberValKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl
@@ -1,7 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/MemberValKeyword.fs", false, QualifiedNameOfFile MemberValKeyword,
-      [], [],
+     ("/root/LeadingKeyword/MemberValKeyword.fs", false,
+      QualifiedNameOfFile MemberValKeyword, [], [],
       [SynModuleOrNamespace
          ([MemberValKeyword], false, AnonModule,
           [Types
@@ -9,7 +9,8 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/MemberValKeyword.fs (2,5--2,6)),
+                     false, None,
+                     /root/LeadingKeyword/MemberValKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AutoProperty
@@ -29,22 +30,29 @@ ImplFile
                            MemberKind = PropertySet },
                          PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None,
-                         Const (Int32 1, /root/MemberValKeyword.fs (3,25--3,26)),
-                         /root/MemberValKeyword.fs (3,4--3,26),
+                         Const
+                           (Int32 1,
+                            /root/LeadingKeyword/MemberValKeyword.fs (3,25--3,26)),
+                         /root/LeadingKeyword/MemberValKeyword.fs (3,4--3,26),
                          { LeadingKeyword =
                             MemberVal
-                              (/root/MemberValKeyword.fs (3,4--3,10),
-                               /root/MemberValKeyword.fs (3,11--3,14))
+                              (/root/LeadingKeyword/MemberValKeyword.fs (3,4--3,10),
+                               /root/LeadingKeyword/MemberValKeyword.fs (3,11--3,14))
                            WithKeyword = None
                            EqualsRange =
-                            Some /root/MemberValKeyword.fs (3,23--3,24)
+                            Some
+                              /root/LeadingKeyword/MemberValKeyword.fs (3,23--3,24)
                            GetSetKeywords = None })],
-                     /root/MemberValKeyword.fs (3,4--3,26)), [], None,
-                  /root/MemberValKeyword.fs (2,5--3,26),
-                  { LeadingKeyword = Type /root/MemberValKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/MemberValKeyword.fs (2,7--2,8)
+                     /root/LeadingKeyword/MemberValKeyword.fs (3,4--3,26)), [],
+                  None, /root/LeadingKeyword/MemberValKeyword.fs (2,5--3,26),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/MemberValKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/MemberValKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/MemberValKeyword.fs (2,0--3,26))], PreXmlDocEmpty, [], None,
-          /root/MemberValKeyword.fs (2,0--4,0), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
+              /root/LeadingKeyword/MemberValKeyword.fs (2,0--3,26))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/MemberValKeyword.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NewKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NewKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs
diff --git a/tests/service/data/SyntaxTree/NewKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl
similarity index 51%
rename from tests/service/data/SyntaxTree/NewKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl
index 39683307a48..91300769c73 100644
--- a/tests/service/data/SyntaxTree/NewKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/NewKeyword.fs", false, QualifiedNameOfFile NewKeyword, [], [],
+     ("/root/LeadingKeyword/NewKeyword.fs", false,
+      QualifiedNameOfFile NewKeyword, [], [],
       [SynModuleOrNamespace
          ([NewKeyword], false, AnonModule,
           [Types
@@ -8,14 +9,17 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [Y],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/NewKeyword.fs (2,5--2,6)),
+                     false, None, /root/LeadingKeyword/NewKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
-                         SimplePats ([], /root/NewKeyword.fs (2,6--2,8)), None,
+                         SimplePats
+                           ([], /root/LeadingKeyword/NewKeyword.fs (2,6--2,8)),
+                         None,
                          PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/NewKeyword.fs (2,5--2,6), { AsKeyword = None });
+                         /root/LeadingKeyword/NewKeyword.fs (2,5--2,6),
+                         { AsKeyword = None });
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
@@ -38,35 +42,47 @@ ImplFile
                                     (Typed
                                        (Named
                                           (SynIdent (message, None), false, None,
-                                           /root/NewKeyword.fs (3,9--3,16)),
+                                           /root/LeadingKeyword/NewKeyword.fs (3,9--3,16)),
                                         LongIdent
                                           (SynLongIdent ([string], [], [None])),
-                                        /root/NewKeyword.fs (3,9--3,23)),
-                                     /root/NewKeyword.fs (3,8--3,24))], None,
-                               /root/NewKeyword.fs (3,4--3,7)), None,
+                                        /root/LeadingKeyword/NewKeyword.fs (3,9--3,23)),
+                                     /root/LeadingKeyword/NewKeyword.fs (3,8--3,24))],
+                               None,
+                               /root/LeadingKeyword/NewKeyword.fs (3,4--3,7)),
+                            None,
                             App
                               (Atomic, false, Ident Y,
-                               Const (Unit, /root/NewKeyword.fs (3,28--3,30)),
-                               /root/NewKeyword.fs (3,27--3,30)),
-                            /root/NewKeyword.fs (3,4--3,24), NoneAtInvisible,
+                               Const
+                                 (Unit,
+                                  /root/LeadingKeyword/NewKeyword.fs (3,28--3,30)),
+                               /root/LeadingKeyword/NewKeyword.fs (3,27--3,30)),
+                            /root/LeadingKeyword/NewKeyword.fs (3,4--3,24),
+                            NoneAtInvisible,
                             { LeadingKeyword =
-                               New /root/NewKeyword.fs (3,4--3,7)
+                               New /root/LeadingKeyword/NewKeyword.fs (3,4--3,7)
                               InlineKeyword = None
                               EqualsRange =
-                               Some /root/NewKeyword.fs (3,25--3,26) }),
-                         /root/NewKeyword.fs (3,4--3,30))],
-                     /root/NewKeyword.fs (3,4--3,30)), [],
+                               Some
+                                 /root/LeadingKeyword/NewKeyword.fs (3,25--3,26) }),
+                         /root/LeadingKeyword/NewKeyword.fs (3,4--3,30))],
+                     /root/LeadingKeyword/NewKeyword.fs (3,4--3,30)), [],
                   Some
                     (ImplicitCtor
                        (None, [],
-                        SimplePats ([], /root/NewKeyword.fs (2,6--2,8)), None,
+                        SimplePats
+                          ([], /root/LeadingKeyword/NewKeyword.fs (2,6--2,8)),
+                        None,
                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/NewKeyword.fs (2,5--2,6), { AsKeyword = None })),
-                  /root/NewKeyword.fs (2,5--3,30),
-                  { LeadingKeyword = Type /root/NewKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/NewKeyword.fs (2,9--2,10)
-                    WithKeyword = None })], /root/NewKeyword.fs (2,0--3,30))],
-          PreXmlDocEmpty, [], None, /root/NewKeyword.fs (2,0--4,0),
+                        /root/LeadingKeyword/NewKeyword.fs (2,5--2,6),
+                        { AsKeyword = None })),
+                  /root/LeadingKeyword/NewKeyword.fs (2,5--3,30),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/NewKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/NewKeyword.fs (2,9--2,10)
+                    WithKeyword = None })],
+              /root/LeadingKeyword/NewKeyword.fs (2,0--3,30))], PreXmlDocEmpty,
+          [], None, /root/LeadingKeyword/NewKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OverrideKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/OverrideKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs
diff --git a/tests/service/data/SyntaxTree/OverrideKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/OverrideKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl
index 898576dc400..4669991701a 100644
--- a/tests/service/data/SyntaxTree/OverrideKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl
@@ -1,7 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/OverrideKeyword.fs", false, QualifiedNameOfFile OverrideKeyword, [],
-      [],
+     ("/root/LeadingKeyword/OverrideKeyword.fs", false,
+      QualifiedNameOfFile OverrideKeyword, [], [],
       [SynModuleOrNamespace
          ([OverrideKeyword], false, AnonModule,
           [Types
@@ -9,7 +9,8 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [D],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/OverrideKeyword.fs (2,5--2,6)),
+                     false, None,
+                     /root/LeadingKeyword/OverrideKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -29,36 +30,44 @@ ImplFile
                             LongIdent
                               (SynLongIdent ([E], [], [None]), None, None,
                                Pats [], None,
-                               /root/OverrideKeyword.fs (3,13--3,14)),
+                               /root/LeadingKeyword/OverrideKeyword.fs (3,13--3,14)),
                             Some
                               (SynBindingReturnInfo
                                  (LongIdent
                                     (SynLongIdent ([string], [], [None])),
-                                  /root/OverrideKeyword.fs (3,17--3,23), [],
+                                  /root/LeadingKeyword/OverrideKeyword.fs (3,17--3,23),
+                                  [],
                                   { ColonRange =
-                                     Some /root/OverrideKeyword.fs (3,15--3,16) })),
+                                     Some
+                                       /root/LeadingKeyword/OverrideKeyword.fs (3,15--3,16) })),
                             Typed
                               (Const
                                  (String
                                     ("", Regular,
-                                     /root/OverrideKeyword.fs (3,26--3,28)),
-                                  /root/OverrideKeyword.fs (3,26--3,28)),
+                                     /root/LeadingKeyword/OverrideKeyword.fs (3,26--3,28)),
+                                  /root/LeadingKeyword/OverrideKeyword.fs (3,26--3,28)),
                                LongIdent (SynLongIdent ([string], [], [None])),
-                               /root/OverrideKeyword.fs (3,26--3,28)),
-                            /root/OverrideKeyword.fs (3,13--3,14),
+                               /root/LeadingKeyword/OverrideKeyword.fs (3,26--3,28)),
+                            /root/LeadingKeyword/OverrideKeyword.fs (3,13--3,14),
                             NoneAtInvisible,
                             { LeadingKeyword =
-                               Override /root/OverrideKeyword.fs (3,4--3,12)
+                               Override
+                                 /root/LeadingKeyword/OverrideKeyword.fs (3,4--3,12)
                               InlineKeyword = None
                               EqualsRange =
-                               Some /root/OverrideKeyword.fs (3,24--3,25) }),
-                         /root/OverrideKeyword.fs (3,4--3,28))],
-                     /root/OverrideKeyword.fs (3,4--3,28)), [], None,
-                  /root/OverrideKeyword.fs (2,5--3,28),
-                  { LeadingKeyword = Type /root/OverrideKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/OverrideKeyword.fs (2,7--2,8)
-                    WithKeyword = None })], /root/OverrideKeyword.fs (2,0--3,28))],
-          PreXmlDocEmpty, [], None, /root/OverrideKeyword.fs (2,0--4,0),
+                               Some
+                                 /root/LeadingKeyword/OverrideKeyword.fs (3,24--3,25) }),
+                         /root/LeadingKeyword/OverrideKeyword.fs (3,4--3,28))],
+                     /root/LeadingKeyword/OverrideKeyword.fs (3,4--3,28)), [],
+                  None, /root/LeadingKeyword/OverrideKeyword.fs (2,5--3,28),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/OverrideKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/OverrideKeyword.fs (2,7--2,8)
+                    WithKeyword = None })],
+              /root/LeadingKeyword/OverrideKeyword.fs (2,0--3,28))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/OverrideKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OverrideValKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/OverrideValKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs
diff --git a/tests/service/data/SyntaxTree/OverrideValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl
similarity index 59%
rename from tests/service/data/SyntaxTree/OverrideValKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl
index cdbd91e2a6a..ec27cc01484 100644
--- a/tests/service/data/SyntaxTree/OverrideValKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/OverrideValKeyword.fs", false,
+     ("/root/LeadingKeyword/OverrideValKeyword.fs", false,
       QualifiedNameOfFile OverrideValKeyword, [], [],
       [SynModuleOrNamespace
          ([OverrideValKeyword], false, AnonModule,
@@ -9,7 +9,8 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/OverrideValKeyword.fs (2,5--2,6)),
+                     false, None,
+                     /root/LeadingKeyword/OverrideValKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AutoProperty
@@ -30,23 +31,28 @@ ImplFile
                          PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None,
                          Const
-                           (Int32 1, /root/OverrideValKeyword.fs (3,27--3,28)),
-                         /root/OverrideValKeyword.fs (3,4--3,28),
+                           (Int32 1,
+                            /root/LeadingKeyword/OverrideValKeyword.fs (3,27--3,28)),
+                         /root/LeadingKeyword/OverrideValKeyword.fs (3,4--3,28),
                          { LeadingKeyword =
                             OverrideVal
-                              (/root/OverrideValKeyword.fs (3,4--3,12),
-                               /root/OverrideValKeyword.fs (3,13--3,16))
+                              (/root/LeadingKeyword/OverrideValKeyword.fs (3,4--3,12),
+                               /root/LeadingKeyword/OverrideValKeyword.fs (3,13--3,16))
                            WithKeyword = None
                            EqualsRange =
-                            Some /root/OverrideValKeyword.fs (3,25--3,26)
+                            Some
+                              /root/LeadingKeyword/OverrideValKeyword.fs (3,25--3,26)
                            GetSetKeywords = None })],
-                     /root/OverrideValKeyword.fs (3,4--3,28)), [], None,
-                  /root/OverrideValKeyword.fs (2,5--3,28),
-                  { LeadingKeyword = Type /root/OverrideValKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/OverrideValKeyword.fs (2,7--2,8)
+                     /root/LeadingKeyword/OverrideValKeyword.fs (3,4--3,28)), [],
+                  None, /root/LeadingKeyword/OverrideValKeyword.fs (2,5--3,28),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/OverrideValKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/OverrideValKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/OverrideValKeyword.fs (2,0--3,28))], PreXmlDocEmpty, [],
-          None, /root/OverrideValKeyword.fs (2,0--4,0),
+              /root/LeadingKeyword/OverrideValKeyword.fs (2,0--3,28))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/OverrideValKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/StaticAbstractKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs
diff --git a/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl
similarity index 59%
rename from tests/service/data/SyntaxTree/StaticAbstractKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl
index 253dd755122..f6cd5aeaff7 100644
--- a/tests/service/data/SyntaxTree/StaticAbstractKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/StaticAbstractKeyword.fs", false,
+     ("/root/LeadingKeyword/StaticAbstractKeyword.fs", false,
       QualifiedNameOfFile StaticAbstractKeyword, [], [],
       [SynModuleOrNamespace
          ([StaticAbstractKeyword], false, AnonModule,
@@ -9,7 +9,8 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/StaticAbstractKeyword.fs (2,5--2,6)),
+                     false, None,
+                     /root/LeadingKeyword/StaticAbstractKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AbstractSlot
@@ -19,19 +20,19 @@ ImplFile
                             Fun
                               (LongIdent (SynLongIdent ([int], [], [None])),
                                LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/StaticAbstractKeyword.fs (3,24--3,34),
+                               /root/LeadingKeyword/StaticAbstractKeyword.fs (3,24--3,34),
                                { ArrowRange =
-                                  /root/StaticAbstractKeyword.fs (3,28--3,30) }),
+                                  /root/LeadingKeyword/StaticAbstractKeyword.fs (3,28--3,30) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]],
                                SynArgInfo ([], false, None)), false, false,
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/StaticAbstractKeyword.fs (3,4--3,34),
+                            /root/LeadingKeyword/StaticAbstractKeyword.fs (3,4--3,34),
                             { LeadingKeyword =
                                StaticAbstract
-                                 (/root/StaticAbstractKeyword.fs (3,4--3,10),
-                                  /root/StaticAbstractKeyword.fs (3,11--3,19))
+                                 (/root/LeadingKeyword/StaticAbstractKeyword.fs (3,4--3,10),
+                                  /root/LeadingKeyword/StaticAbstractKeyword.fs (3,11--3,19))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -41,16 +42,21 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/StaticAbstractKeyword.fs (3,4--3,34),
+                         /root/LeadingKeyword/StaticAbstractKeyword.fs (3,4--3,34),
                          { GetSetKeywords = None })],
-                     /root/StaticAbstractKeyword.fs (3,4--3,34)), [], None,
-                  /root/StaticAbstractKeyword.fs (2,5--3,34),
+                     /root/LeadingKeyword/StaticAbstractKeyword.fs (3,4--3,34)),
+                  [], None,
+                  /root/LeadingKeyword/StaticAbstractKeyword.fs (2,5--3,34),
                   { LeadingKeyword =
-                     Type /root/StaticAbstractKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/StaticAbstractKeyword.fs (2,7--2,8)
+                     Type
+                       /root/LeadingKeyword/StaticAbstractKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/LeadingKeyword/StaticAbstractKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/StaticAbstractKeyword.fs (2,0--3,34))], PreXmlDocEmpty, [],
-          None, /root/StaticAbstractKeyword.fs (2,0--4,0),
+              /root/LeadingKeyword/StaticAbstractKeyword.fs (2,0--3,34))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/StaticAbstractKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs
diff --git a/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl
similarity index 58%
rename from tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl
index 02a8fab44db..d3380a08e1d 100644
--- a/tests/service/data/SyntaxTree/StaticAbstractMemberKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/StaticAbstractMemberKeyword.fs", false,
+     ("/root/LeadingKeyword/StaticAbstractMemberKeyword.fs", false,
       QualifiedNameOfFile StaticAbstractMemberKeyword, [], [],
       [SynModuleOrNamespace
          ([StaticAbstractMemberKeyword], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/StaticAbstractMemberKeyword.fs (2,5--2,6)),
+                     /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AbstractSlot
@@ -20,20 +20,20 @@ ImplFile
                             Fun
                               (LongIdent (SynLongIdent ([int], [], [None])),
                                LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/StaticAbstractMemberKeyword.fs (3,31--3,41),
+                               /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (3,31--3,41),
                                { ArrowRange =
-                                  /root/StaticAbstractMemberKeyword.fs (3,35--3,37) }),
+                                  /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (3,35--3,37) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]],
                                SynArgInfo ([], false, None)), false, false,
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/StaticAbstractMemberKeyword.fs (3,4--3,41),
+                            /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (3,4--3,41),
                             { LeadingKeyword =
                                StaticAbstractMember
-                                 (/root/StaticAbstractMemberKeyword.fs (3,4--3,10),
-                                  /root/StaticAbstractMemberKeyword.fs (3,11--3,19),
-                                  /root/StaticAbstractMemberKeyword.fs (3,20--3,26))
+                                 (/root/LeadingKeyword/StaticAbstractMemberKeyword.fs (3,4--3,10),
+                                  /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (3,11--3,19),
+                                  /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (3,20--3,26))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -43,17 +43,21 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/StaticAbstractMemberKeyword.fs (3,4--3,41),
+                         /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (3,4--3,41),
                          { GetSetKeywords = None })],
-                     /root/StaticAbstractMemberKeyword.fs (3,4--3,41)), [], None,
-                  /root/StaticAbstractMemberKeyword.fs (2,5--3,41),
+                     /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (3,4--3,41)),
+                  [], None,
+                  /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (2,5--3,41),
                   { LeadingKeyword =
-                     Type /root/StaticAbstractMemberKeyword.fs (2,0--2,4)
+                     Type
+                       /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/StaticAbstractMemberKeyword.fs (2,7--2,8)
+                     Some
+                       /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/StaticAbstractMemberKeyword.fs (2,0--3,41))], PreXmlDocEmpty,
-          [], None, /root/StaticAbstractMemberKeyword.fs (2,0--4,0),
+              /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (2,0--3,41))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticLetKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/StaticLetKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl
new file mode 100644
index 00000000000..44bdc10800c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl
@@ -0,0 +1,57 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LeadingKeyword/StaticLetKeyword.fs", false,
+      QualifiedNameOfFile StaticLetKeyword, [], [],
+      [SynModuleOrNamespace
+         ([StaticLetKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/LeadingKeyword/StaticLetKeyword.fs (2,5--2,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [LetBindings
+                        ([SynBinding
+                            (None, Normal, false, false, [],
+                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                             SynValData
+                               (None,
+                                SynValInfo ([], SynArgInfo ([], false, None)),
+                                None),
+                             LongIdent
+                               (SynLongIdent ([PI], [], [None]), None, None,
+                                Pats [], None,
+                                /root/LeadingKeyword/StaticLetKeyword.fs (3,15--3,17)),
+                             None,
+                             Const
+                               (Double 3.14,
+                                /root/LeadingKeyword/StaticLetKeyword.fs (3,20--3,24)),
+                             /root/LeadingKeyword/StaticLetKeyword.fs (3,15--3,17),
+                             Yes
+                               /root/LeadingKeyword/StaticLetKeyword.fs (3,11--3,24),
+                             { LeadingKeyword =
+                                StaticLet
+                                  (/root/LeadingKeyword/StaticLetKeyword.fs (3,4--3,10),
+                                   /root/LeadingKeyword/StaticLetKeyword.fs (3,11--3,14))
+                               InlineKeyword = None
+                               EqualsRange =
+                                Some
+                                  /root/LeadingKeyword/StaticLetKeyword.fs (3,18--3,19) })],
+                         true, false,
+                         /root/LeadingKeyword/StaticLetKeyword.fs (3,4--3,24))],
+                     /root/LeadingKeyword/StaticLetKeyword.fs (3,4--3,24)), [],
+                  None, /root/LeadingKeyword/StaticLetKeyword.fs (2,5--3,24),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/StaticLetKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/StaticLetKeyword.fs (2,7--2,8)
+                    WithKeyword = None })],
+              /root/LeadingKeyword/StaticLetKeyword.fs (2,0--3,24))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/StaticLetKeyword.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/StaticLetRecKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl
new file mode 100644
index 00000000000..772abe800bb
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl
@@ -0,0 +1,67 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LeadingKeyword/StaticLetRecKeyword.fs", false,
+      QualifiedNameOfFile StaticLetRecKeyword, [], [],
+      [SynModuleOrNamespace
+         ([StaticLetRecKeyword], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/LeadingKeyword/StaticLetRecKeyword.fs (2,5--2,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [LetBindings
+                        ([SynBinding
+                            (None, Normal, false, false, [],
+                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                             SynValData
+                               (None,
+                                SynValInfo ([[]], SynArgInfo ([], false, None)),
+                                None),
+                             LongIdent
+                               (SynLongIdent ([forever], [], [None]), None, None,
+                                Pats
+                                  [Paren
+                                     (Const
+                                        (Unit,
+                                         /root/LeadingKeyword/StaticLetRecKeyword.fs (3,27--3,29)),
+                                      /root/LeadingKeyword/StaticLetRecKeyword.fs (3,27--3,29))],
+                                None,
+                                /root/LeadingKeyword/StaticLetRecKeyword.fs (3,19--3,29)),
+                             None,
+                             App
+                               (Atomic, false, Ident forever,
+                                Const
+                                  (Unit,
+                                   /root/LeadingKeyword/StaticLetRecKeyword.fs (3,39--3,41)),
+                                /root/LeadingKeyword/StaticLetRecKeyword.fs (3,32--3,41)),
+                             /root/LeadingKeyword/StaticLetRecKeyword.fs (3,19--3,29),
+                             NoneAtLet,
+                             { LeadingKeyword =
+                                StaticLetRec
+                                  (/root/LeadingKeyword/StaticLetRecKeyword.fs (3,4--3,10),
+                                   /root/LeadingKeyword/StaticLetRecKeyword.fs (3,11--3,14),
+                                   /root/LeadingKeyword/StaticLetRecKeyword.fs (3,15--3,18))
+                               InlineKeyword = None
+                               EqualsRange =
+                                Some
+                                  /root/LeadingKeyword/StaticLetRecKeyword.fs (3,30--3,31) })],
+                         true, true,
+                         /root/LeadingKeyword/StaticLetRecKeyword.fs (3,4--3,41))],
+                     /root/LeadingKeyword/StaticLetRecKeyword.fs (3,4--3,41)),
+                  [], None,
+                  /root/LeadingKeyword/StaticLetRecKeyword.fs (2,5--3,41),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/StaticLetRecKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/StaticLetRecKeyword.fs (2,7--2,8)
+                    WithKeyword = None })],
+              /root/LeadingKeyword/StaticLetRecKeyword.fs (2,0--3,41))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/StaticLetRecKeyword.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticMemberKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/StaticMemberKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs
diff --git a/tests/service/data/SyntaxTree/StaticMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl
similarity index 56%
rename from tests/service/data/SyntaxTree/StaticMemberKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl
index 6113fa54693..1e12566001b 100644
--- a/tests/service/data/SyntaxTree/StaticMemberKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/StaticMemberKeyword.fs", false,
+     ("/root/LeadingKeyword/StaticMemberKeyword.fs", false,
       QualifiedNameOfFile StaticMemberKeyword, [], [],
       [SynModuleOrNamespace
          ([StaticMemberKeyword], false, AnonModule,
@@ -9,7 +9,8 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/StaticMemberKeyword.fs (2,5--2,6)),
+                     false, None,
+                     /root/LeadingKeyword/StaticMemberKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -28,38 +29,43 @@ ImplFile
                             LongIdent
                               (SynLongIdent ([Y], [], [None]), None, None,
                                Pats [], None,
-                               /root/StaticMemberKeyword.fs (3,18--3,19)),
+                               /root/LeadingKeyword/StaticMemberKeyword.fs (3,18--3,19)),
                             Some
                               (SynBindingReturnInfo
                                  (LongIdent (SynLongIdent ([int], [], [None])),
-                                  /root/StaticMemberKeyword.fs (3,22--3,25), [],
+                                  /root/LeadingKeyword/StaticMemberKeyword.fs (3,22--3,25),
+                                  [],
                                   { ColonRange =
                                      Some
-                                       /root/StaticMemberKeyword.fs (3,20--3,21) })),
+                                       /root/LeadingKeyword/StaticMemberKeyword.fs (3,20--3,21) })),
                             Typed
                               (Const
                                  (Int32 1,
-                                  /root/StaticMemberKeyword.fs (3,28--3,29)),
+                                  /root/LeadingKeyword/StaticMemberKeyword.fs (3,28--3,29)),
                                LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/StaticMemberKeyword.fs (3,28--3,29)),
-                            /root/StaticMemberKeyword.fs (3,18--3,19),
+                               /root/LeadingKeyword/StaticMemberKeyword.fs (3,28--3,29)),
+                            /root/LeadingKeyword/StaticMemberKeyword.fs (3,18--3,19),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                StaticMember
-                                 (/root/StaticMemberKeyword.fs (3,4--3,10),
-                                  /root/StaticMemberKeyword.fs (3,11--3,17))
+                                 (/root/LeadingKeyword/StaticMemberKeyword.fs (3,4--3,10),
+                                  /root/LeadingKeyword/StaticMemberKeyword.fs (3,11--3,17))
                               InlineKeyword = None
                               EqualsRange =
-                               Some /root/StaticMemberKeyword.fs (3,26--3,27) }),
-                         /root/StaticMemberKeyword.fs (3,4--3,29))],
-                     /root/StaticMemberKeyword.fs (3,4--3,29)), [], None,
-                  /root/StaticMemberKeyword.fs (2,5--3,29),
+                               Some
+                                 /root/LeadingKeyword/StaticMemberKeyword.fs (3,26--3,27) }),
+                         /root/LeadingKeyword/StaticMemberKeyword.fs (3,4--3,29))],
+                     /root/LeadingKeyword/StaticMemberKeyword.fs (3,4--3,29)),
+                  [], None,
+                  /root/LeadingKeyword/StaticMemberKeyword.fs (2,5--3,29),
                   { LeadingKeyword =
-                     Type /root/StaticMemberKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/StaticMemberKeyword.fs (2,7--2,8)
+                     Type /root/LeadingKeyword/StaticMemberKeyword.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/StaticMemberKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/StaticMemberKeyword.fs (2,0--3,29))], PreXmlDocEmpty, [],
-          None, /root/StaticMemberKeyword.fs (2,0--4,0),
+              /root/LeadingKeyword/StaticMemberKeyword.fs (2,0--3,29))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/StaticMemberKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/StaticMemberValKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs
diff --git a/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl
similarity index 59%
rename from tests/service/data/SyntaxTree/StaticMemberValKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl
index 1c31254e31e..1b0025e0744 100644
--- a/tests/service/data/SyntaxTree/StaticMemberValKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/StaticMemberValKeyword.fs", false,
+     ("/root/LeadingKeyword/StaticMemberValKeyword.fs", false,
       QualifiedNameOfFile StaticMemberValKeyword, [], [],
       [SynModuleOrNamespace
          ([StaticMemberValKeyword], false, AnonModule,
@@ -9,7 +9,8 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/StaticMemberValKeyword.fs (2,5--2,6)),
+                     false, None,
+                     /root/LeadingKeyword/StaticMemberValKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AutoProperty
@@ -31,26 +32,31 @@ ImplFile
                          None,
                          Const
                            (Int32 1,
-                            /root/StaticMemberValKeyword.fs (3,32--3,33)),
-                         /root/StaticMemberValKeyword.fs (3,4--3,33),
+                            /root/LeadingKeyword/StaticMemberValKeyword.fs (3,32--3,33)),
+                         /root/LeadingKeyword/StaticMemberValKeyword.fs (3,4--3,33),
                          { LeadingKeyword =
                             StaticMemberVal
-                              (/root/StaticMemberValKeyword.fs (3,4--3,10),
-                               /root/StaticMemberValKeyword.fs (3,11--3,17),
-                               /root/StaticMemberValKeyword.fs (3,18--3,21))
+                              (/root/LeadingKeyword/StaticMemberValKeyword.fs (3,4--3,10),
+                               /root/LeadingKeyword/StaticMemberValKeyword.fs (3,11--3,17),
+                               /root/LeadingKeyword/StaticMemberValKeyword.fs (3,18--3,21))
                            WithKeyword = None
                            EqualsRange =
-                            Some /root/StaticMemberValKeyword.fs (3,30--3,31)
+                            Some
+                              /root/LeadingKeyword/StaticMemberValKeyword.fs (3,30--3,31)
                            GetSetKeywords = None })],
-                     /root/StaticMemberValKeyword.fs (3,4--3,33)), [], None,
-                  /root/StaticMemberValKeyword.fs (2,5--3,33),
+                     /root/LeadingKeyword/StaticMemberValKeyword.fs (3,4--3,33)),
+                  [], None,
+                  /root/LeadingKeyword/StaticMemberValKeyword.fs (2,5--3,33),
                   { LeadingKeyword =
-                     Type /root/StaticMemberValKeyword.fs (2,0--2,4)
+                     Type
+                       /root/LeadingKeyword/StaticMemberValKeyword.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/StaticMemberValKeyword.fs (2,7--2,8)
+                     Some
+                       /root/LeadingKeyword/StaticMemberValKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/StaticMemberValKeyword.fs (2,0--3,33))], PreXmlDocEmpty, [],
-          None, /root/StaticMemberValKeyword.fs (2,0--4,0),
+              /root/LeadingKeyword/StaticMemberValKeyword.fs (2,0--3,33))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/StaticMemberValKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticValKeyword.fsi b/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/StaticValKeyword.fsi
rename to tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl
new file mode 100644
index 00000000000..1b1d104558d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl
@@ -0,0 +1,48 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/LeadingKeyword/StaticValKeyword.fsi",
+      QualifiedNameOfFile StaticValKeyword, [], [],
+      [SynModuleOrNamespaceSig
+         ([Meh], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/LeadingKeyword/StaticValKeyword.fsi (4,5--4,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [ValField
+                        (SynField
+                           ([], true, Some Y,
+                            Fun
+                              (LongIdent (SynLongIdent ([int], [], [None])),
+                               LongIdent (SynLongIdent ([int], [], [None])),
+                               /root/LeadingKeyword/StaticValKeyword.fsi (5,19--5,29),
+                               { ArrowRange =
+                                  /root/LeadingKeyword/StaticValKeyword.fsi (5,23--5,25) }),
+                            false,
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/LeadingKeyword/StaticValKeyword.fsi (5,4--5,29),
+                            { LeadingKeyword =
+                               Some
+                                 (StaticVal
+                                    (/root/LeadingKeyword/StaticValKeyword.fsi (5,4--5,10),
+                                     /root/LeadingKeyword/StaticValKeyword.fsi (5,11--5,14))) }),
+                         /root/LeadingKeyword/StaticValKeyword.fsi (5,4--5,29))],
+                     /root/LeadingKeyword/StaticValKeyword.fsi (5,4--5,29)), [],
+                  /root/LeadingKeyword/StaticValKeyword.fsi (4,5--5,29),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/StaticValKeyword.fsi (4,0--4,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/StaticValKeyword.fsi (4,7--4,8)
+                    WithKeyword = None })],
+              /root/LeadingKeyword/StaticValKeyword.fsi (4,0--5,29))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/StaticValKeyword.fsi (2,0--5,29),
+          { LeadingKeyword =
+             Namespace /root/LeadingKeyword/StaticValKeyword.fsi (2,0--2,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SyntheticKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SyntheticKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl
new file mode 100644
index 00000000000..7df01917f69
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl
@@ -0,0 +1,36 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LeadingKeyword/SyntheticKeyword.fs", false,
+      QualifiedNameOfFile SyntheticKeyword, [], [],
+      [SynModuleOrNamespace
+         ([SyntheticKeyword], false, AnonModule,
+          [Expr
+             (ObjExpr
+                (LongIdent (SynLongIdent ([ISomething], [], [None])), None,
+                 Some /root/LeadingKeyword/SyntheticKeyword.fs (2,17--2,21),
+                 [SynBinding
+                    (None, Normal, false, false, [], PreXmlDocEmpty,
+                     SynValData
+                       (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                        None),
+                     Named
+                       (SynIdent (a, None), false, None,
+                        /root/LeadingKeyword/SyntheticKeyword.fs (3,4--3,5)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/LeadingKeyword/SyntheticKeyword.fs (3,8--3,10)),
+                     /root/LeadingKeyword/SyntheticKeyword.fs (3,4--3,5),
+                     Yes /root/LeadingKeyword/SyntheticKeyword.fs (3,8--3,10),
+                     { LeadingKeyword = Synthetic
+                       InlineKeyword = None
+                       EqualsRange =
+                        Some /root/LeadingKeyword/SyntheticKeyword.fs (3,6--3,7) })],
+                 [], [], /root/LeadingKeyword/SyntheticKeyword.fs (2,2--2,16),
+                 /root/LeadingKeyword/SyntheticKeyword.fs (2,0--3,12)),
+              /root/LeadingKeyword/SyntheticKeyword.fs (2,0--3,12))],
+          PreXmlDocEmpty, [], None,
+          /root/LeadingKeyword/SyntheticKeyword.fs (2,0--3,12),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UseKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/UseKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl
new file mode 100644
index 00000000000..1310e27d9b3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl
@@ -0,0 +1,41 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LeadingKeyword/UseKeyword.fs", false,
+      QualifiedNameOfFile UseKeyword, [], [],
+      [SynModuleOrNamespace
+         ([UseKeyword], false, AnonModule,
+          [Expr
+             (Do
+                (LetOrUse
+                   (false, true,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (x, None), false, None,
+                           /root/LeadingKeyword/UseKeyword.fs (3,8--3,9)), None,
+                        App
+                          (Atomic, false, Ident X,
+                           Const
+                             (Unit,
+                              /root/LeadingKeyword/UseKeyword.fs (3,13--3,15)),
+                           /root/LeadingKeyword/UseKeyword.fs (3,12--3,15)),
+                        /root/LeadingKeyword/UseKeyword.fs (3,8--3,9),
+                        Yes /root/LeadingKeyword/UseKeyword.fs (3,4--3,15),
+                        { LeadingKeyword =
+                           Use /root/LeadingKeyword/UseKeyword.fs (3,4--3,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some /root/LeadingKeyword/UseKeyword.fs (3,10--3,11) })],
+                    Const (Unit, /root/LeadingKeyword/UseKeyword.fs (4,4--4,6)),
+                    /root/LeadingKeyword/UseKeyword.fs (3,4--4,6),
+                    { InKeyword = None }),
+                 /root/LeadingKeyword/UseKeyword.fs (2,0--4,6)),
+              /root/LeadingKeyword/UseKeyword.fs (2,0--4,6))], PreXmlDocEmpty,
+          [], None, /root/LeadingKeyword/UseKeyword.fs (2,0--5,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UseRecKeyword.fs b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/UseRecKeyword.fs
rename to tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl
new file mode 100644
index 00000000000..49eb0e34739
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl
@@ -0,0 +1,46 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/LeadingKeyword/UseRecKeyword.fs", false,
+      QualifiedNameOfFile UseRecKeyword, [], [],
+      [SynModuleOrNamespace
+         ([UseRecKeyword], false, AnonModule,
+          [Expr
+             (Do
+                (LetOrUse
+                   (true, true,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (x, None), false, None,
+                           /root/LeadingKeyword/UseRecKeyword.fs (3,12--3,13)),
+                        None,
+                        App
+                          (Atomic, false, Ident X,
+                           Const
+                             (Unit,
+                              /root/LeadingKeyword/UseRecKeyword.fs (3,17--3,19)),
+                           /root/LeadingKeyword/UseRecKeyword.fs (3,16--3,19)),
+                        /root/LeadingKeyword/UseRecKeyword.fs (3,12--3,13),
+                        Yes /root/LeadingKeyword/UseRecKeyword.fs (3,4--3,19),
+                        { LeadingKeyword =
+                           UseRec
+                             (/root/LeadingKeyword/UseRecKeyword.fs (3,4--3,7),
+                              /root/LeadingKeyword/UseRecKeyword.fs (3,8--3,11))
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/LeadingKeyword/UseRecKeyword.fs (3,14--3,15) })],
+                    Const
+                      (Unit, /root/LeadingKeyword/UseRecKeyword.fs (4,4--4,6)),
+                    /root/LeadingKeyword/UseRecKeyword.fs (3,4--4,6),
+                    { InKeyword = None }),
+                 /root/LeadingKeyword/UseRecKeyword.fs (2,0--4,6)),
+              /root/LeadingKeyword/UseRecKeyword.fs (2,0--4,6))], PreXmlDocEmpty,
+          [], None, /root/LeadingKeyword/UseRecKeyword.fs (2,0--5,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ValKeyword.fsi b/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/ValKeyword.fsi
rename to tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl
new file mode 100644
index 00000000000..7e777bfc331
--- /dev/null
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl
@@ -0,0 +1,39 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/LeadingKeyword/ValKeyword.fsi", QualifiedNameOfFile ValKeyword, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([X], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Y],
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None, /root/LeadingKeyword/ValKeyword.fsi (4,5--4,6)),
+                  ObjectModel
+                    (Unspecified,
+                     [ValField
+                        (SynField
+                           ([], false, Some F,
+                            LongIdent (SynLongIdent ([int], [], [None])), false,
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/LeadingKeyword/ValKeyword.fsi (5,4--5,15),
+                            { LeadingKeyword =
+                               Some
+                                 (Val
+                                    /root/LeadingKeyword/ValKeyword.fsi (5,4--5,7)) }),
+                         /root/LeadingKeyword/ValKeyword.fsi (5,4--5,15))],
+                     /root/LeadingKeyword/ValKeyword.fsi (5,4--5,15)), [],
+                  /root/LeadingKeyword/ValKeyword.fsi (4,5--5,15),
+                  { LeadingKeyword =
+                     Type /root/LeadingKeyword/ValKeyword.fsi (4,0--4,4)
+                    EqualsRange =
+                     Some /root/LeadingKeyword/ValKeyword.fsi (4,7--4,8)
+                    WithKeyword = None })],
+              /root/LeadingKeyword/ValKeyword.fsi (4,0--5,15))], PreXmlDocEmpty,
+          [], None, /root/LeadingKeyword/ValKeyword.fsi (2,0--5,15),
+          { LeadingKeyword =
+             Namespace /root/LeadingKeyword/ValKeyword.fsi (2,0--2,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi.bsl
deleted file mode 100644
index 388c7ee0ff4..00000000000
--- a/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi.bsl
+++ /dev/null
@@ -1,46 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/LeadingKeywordInRecursiveTypes.fsi",
-      QualifiedNameOfFile LeadingKeywordInRecursiveTypes, [], [],
-      [SynModuleOrNamespaceSig
-         ([LeadingKeywordInRecursiveTypes], false, AnonModule,
-          [Types
-             ([SynTypeDefnSig
-                 (SynComponentInfo
-                    ([], None, [], [A],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/LeadingKeywordInRecursiveTypes.fsi (2,5--2,6)),
-                  Simple
-                    (TypeAbbrev
-                       (Ok, LongIdent (SynLongIdent ([obj], [], [None])),
-                        /root/LeadingKeywordInRecursiveTypes.fsi (2,9--2,12)),
-                     /root/LeadingKeywordInRecursiveTypes.fsi (2,9--2,12)), [],
-                  /root/LeadingKeywordInRecursiveTypes.fsi (2,5--2,12),
-                  { LeadingKeyword =
-                     Type /root/LeadingKeywordInRecursiveTypes.fsi (2,0--2,4)
-                    EqualsRange =
-                     Some /root/LeadingKeywordInRecursiveTypes.fsi (2,7--2,8)
-                    WithKeyword = None });
-               SynTypeDefnSig
-                 (SynComponentInfo
-                    ([], None, [], [B],
-                     PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/LeadingKeywordInRecursiveTypes.fsi (3,4--3,5)),
-                  Simple
-                    (TypeAbbrev
-                       (Ok, LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/LeadingKeywordInRecursiveTypes.fsi (3,8--3,11)),
-                     /root/LeadingKeywordInRecursiveTypes.fsi (3,8--3,11)), [],
-                  /root/LeadingKeywordInRecursiveTypes.fsi (3,4--3,11),
-                  { LeadingKeyword =
-                     And /root/LeadingKeywordInRecursiveTypes.fsi (3,0--3,3)
-                    EqualsRange =
-                     Some /root/LeadingKeywordInRecursiveTypes.fsi (3,6--3,7)
-                    WithKeyword = None })],
-              /root/LeadingKeywordInRecursiveTypes.fsi (2,0--3,11))],
-          PreXmlDocEmpty, [], None,
-          /root/LeadingKeywordInRecursiveTypes.fsi (2,0--4,0),
-          { LeadingKeyword = None })], { ConditionalDirectives = []
-                                         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LetKeyword.fs.bsl b/tests/service/data/SyntaxTree/LetKeyword.fs.bsl
deleted file mode 100644
index e161888721c..00000000000
--- a/tests/service/data/SyntaxTree/LetKeyword.fs.bsl
+++ /dev/null
@@ -1,42 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/LetKeyword.fs", false, QualifiedNameOfFile LetKeyword, [], [],
-      [SynModuleOrNamespace
-         ([LetKeyword], false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None,
-                     SynValInfo
-                       ([[SynArgInfo ([], false, Some b)]],
-                        SynArgInfo ([], false, None)), None),
-                  LongIdent
-                    (SynLongIdent ([a], [], [None]), None, None,
-                     Pats
-                       [Named
-                          (SynIdent (b, None), false, None,
-                           /root/LetKeyword.fs (2,6--2,7))], None,
-                     /root/LetKeyword.fs (2,4--2,7)), None,
-                  App
-                    (NonAtomic, false,
-                     App
-                       (NonAtomic, true,
-                        LongIdent
-                          (false,
-                           SynLongIdent
-                             ([op_Addition], [], [Some (OriginalNotation "+")]),
-                           None, /root/LetKeyword.fs (2,12--2,13)), Ident b,
-                        /root/LetKeyword.fs (2,10--2,13)),
-                     Const (Int32 1, /root/LetKeyword.fs (2,14--2,15)),
-                     /root/LetKeyword.fs (2,10--2,15)),
-                  /root/LetKeyword.fs (2,4--2,7), NoneAtLet,
-                  { LeadingKeyword = Let /root/LetKeyword.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange = Some /root/LetKeyword.fs (2,8--2,9) })],
-              /root/LetKeyword.fs (2,0--2,15))], PreXmlDocEmpty, [], None,
-          /root/LetKeyword.fs (2,0--3,0), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LetRecKeyword.fs.bsl
deleted file mode 100644
index e560020d8a1..00000000000
--- a/tests/service/data/SyntaxTree/LetRecKeyword.fs.bsl
+++ /dev/null
@@ -1,45 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/LetRecKeyword.fs", false, QualifiedNameOfFile LetRecKeyword, [], [],
-      [SynModuleOrNamespace
-         ([LetRecKeyword], false, AnonModule,
-          [Let
-             (true,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None,
-                     SynValInfo
-                       ([[SynArgInfo ([], false, Some b)]],
-                        SynArgInfo ([], false, None)), None),
-                  LongIdent
-                    (SynLongIdent ([a], [], [None]), None, None,
-                     Pats
-                       [Named
-                          (SynIdent (b, None), false, None,
-                           /root/LetRecKeyword.fs (2,10--2,11))], None,
-                     /root/LetRecKeyword.fs (2,8--2,11)), None,
-                  App
-                    (NonAtomic, false,
-                     App
-                       (NonAtomic, true,
-                        LongIdent
-                          (false,
-                           SynLongIdent
-                             ([op_Addition], [], [Some (OriginalNotation "+")]),
-                           None, /root/LetRecKeyword.fs (2,16--2,17)), Ident b,
-                        /root/LetRecKeyword.fs (2,14--2,17)),
-                     Const (Int32 1, /root/LetRecKeyword.fs (2,18--2,19)),
-                     /root/LetRecKeyword.fs (2,14--2,19)),
-                  /root/LetRecKeyword.fs (2,8--2,11), NoneAtLet,
-                  { LeadingKeyword =
-                     LetRec
-                       (/root/LetRecKeyword.fs (2,0--2,3),
-                        /root/LetRecKeyword.fs (2,4--2,7))
-                    InlineKeyword = None
-                    EqualsRange = Some /root/LetRecKeyword.fs (2,12--2,13) })],
-              /root/LetRecKeyword.fs (2,0--2,19))], PreXmlDocEmpty, [], None,
-          /root/LetRecKeyword.fs (2,0--3,0), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs b/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
rename to tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
diff --git a/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
new file mode 100644
index 00000000000..493dd97cc5c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
@@ -0,0 +1,53 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs",
+      false,
+      QualifiedNameOfFile NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith,
+      [], [],
+      [SynModuleOrNamespace
+         ([NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith], false,
+          AnonModule,
+          [Expr
+             (TryWith
+                (App
+                   (NonAtomic, false, Ident foo,
+                    Const
+                      (Unit,
+                       /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,8--3,10)),
+                    /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,4--3,10)),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (exn, None), false, None,
+                        /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,5--4,8)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (6,4--6,6)),
+                     /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,5--6,6),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,9--4,11)
+                       BarRange = None })],
+                 /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--6,6),
+                 Yes
+                   /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--2,3),
+                 Yes
+                   /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,4),
+                 { TryKeyword =
+                    /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--2,3)
+                   TryToWithRange =
+                    /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--4,4)
+                   WithKeyword =
+                    /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,4)
+                   WithToEndRange =
+                    /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--6,6) }),
+              /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--6,6))],
+          PreXmlDocEmpty, [], None,
+          /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--7,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,4--5,19)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs
rename to tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl
new file mode 100644
index 00000000000..896e14e20d0
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl
@@ -0,0 +1,43 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MatchClause/RangeOfArrowInSynMatchClause.fs", false,
+      QualifiedNameOfFile RangeOfArrowInSynMatchClause, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfArrowInSynMatchClause], false, AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/MatchClause/RangeOfArrowInSynMatchClause.fs (2,0--2,14),
+                 Ident foo,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([Bar], [], [None]), None, None,
+                        Pats
+                          [Named
+                             (SynIdent (bar, None), false, None,
+                              /root/MatchClause/RangeOfArrowInSynMatchClause.fs (3,6--3,9))],
+                        None,
+                        /root/MatchClause/RangeOfArrowInSynMatchClause.fs (3,2--3,9)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/MatchClause/RangeOfArrowInSynMatchClause.fs (3,13--3,15)),
+                     /root/MatchClause/RangeOfArrowInSynMatchClause.fs (3,2--3,15),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/MatchClause/RangeOfArrowInSynMatchClause.fs (3,10--3,12)
+                       BarRange =
+                        Some
+                          /root/MatchClause/RangeOfArrowInSynMatchClause.fs (3,0--3,1) })],
+                 /root/MatchClause/RangeOfArrowInSynMatchClause.fs (2,0--3,15),
+                 { MatchKeyword =
+                    /root/MatchClause/RangeOfArrowInSynMatchClause.fs (2,0--2,5)
+                   WithKeyword =
+                    /root/MatchClause/RangeOfArrowInSynMatchClause.fs (2,10--2,14) }),
+              /root/MatchClause/RangeOfArrowInSynMatchClause.fs (2,0--3,15))],
+          PreXmlDocEmpty, [], None,
+          /root/MatchClause/RangeOfArrowInSynMatchClause.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs
rename to tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
new file mode 100644
index 00000000000..fe53e78de0a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
@@ -0,0 +1,51 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs", false,
+      QualifiedNameOfFile RangeOfArrowInSynMatchClauseWithWhenClause, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfArrowInSynMatchClauseWithWhenClause], false, AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--2,14),
+                 Ident foo,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([Bar], [], [None]), None, None,
+                        Pats
+                          [Named
+                             (SynIdent (bar, None), false, None,
+                              /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,6--3,9))],
+                        None,
+                        /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,2--3,9)),
+                     Some
+                       (Paren
+                          (App
+                             (NonAtomic, false, Ident someCheck, Ident bar,
+                              /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,16--3,29)),
+                           /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,15--3,16),
+                           Some
+                             /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,29--3,30),
+                           /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,15--3,30))),
+                     Const
+                       (Unit,
+                        /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,34--3,36)),
+                     /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,2--3,36),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,31--3,33)
+                       BarRange =
+                        Some
+                          /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,0--3,1) })],
+                 /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--3,36),
+                 { MatchKeyword =
+                    /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--2,5)
+                   WithKeyword =
+                    /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,10--2,14) }),
+              /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--3,36))],
+          PreXmlDocEmpty, [], None,
+          /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs
rename to tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
new file mode 100644
index 00000000000..bc4084ac3bc
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
@@ -0,0 +1,77 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs",
+      false,
+      QualifiedNameOfFile RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith], false,
+          AnonModule,
+          [Expr
+             (TryWith
+                (App
+                   (NonAtomic, false, Ident foo,
+                    Const
+                      (Unit,
+                       /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (3,8--3,10)),
+                    /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (3,4--3,10)),
+                 [SynMatchClause
+                    (As
+                       (LongIdent
+                          (SynLongIdent ([IOException], [], [None]), None, None,
+                           Pats [], None,
+                           /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,2--5,13)),
+                        Named
+                          (SynIdent (ioex, None), false, None,
+                           /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,17--5,21)),
+                        /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,2--5,21)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (7,4--7,6)),
+                     /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,2--7,6),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,22--5,24)
+                       BarRange =
+                        Some
+                          /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,0--5,1) });
+                  SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,2--8,4)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,8--8,10)),
+                     /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,2--8,10),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,5--8,7)
+                       BarRange =
+                        Some
+                          /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,0--8,1) })],
+                 /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--8,10),
+                 Yes
+                   /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--2,3),
+                 Yes
+                   /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,0--4,4),
+                 { TryKeyword =
+                    /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--2,3)
+                   TryToWithRange =
+                    /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--4,4)
+                   WithKeyword =
+                    /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,0--4,4)
+                   WithToEndRange =
+                    /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,0--8,10) }),
+              /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--8,10))],
+          PreXmlDocEmpty, [], None,
+          /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--9,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (6,4--6,19)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs
rename to tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
new file mode 100644
index 00000000000..784c4bb1bec
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
@@ -0,0 +1,52 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs",
+      false, QualifiedNameOfFile RangeOfBarInASingleSynMatchClauseInSynExprMatch,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfBarInASingleSynMatchClauseInSynExprMatch], false, AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--2,14),
+                 Ident foo,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([Bar], [], [None]), None, None,
+                        Pats
+                          [Named
+                             (SynIdent (bar, None), false, None,
+                              /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,6--3,9))],
+                        None,
+                        /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,2--3,9)),
+                     Some
+                       (Paren
+                          (App
+                             (NonAtomic, false, Ident someCheck, Ident bar,
+                              /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,16--3,29)),
+                           /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,15--3,16),
+                           Some
+                             /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,29--3,30),
+                           /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,15--3,30))),
+                     Const
+                       (Unit,
+                        /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,34--3,36)),
+                     /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,2--3,36),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,31--3,33)
+                       BarRange =
+                        Some
+                          /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,0--3,1) })],
+                 /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--3,36),
+                 { MatchKeyword =
+                    /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--2,5)
+                   WithKeyword =
+                    /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,10--2,14) }),
+              /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--3,36))],
+          PreXmlDocEmpty, [], None,
+          /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
rename to tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
new file mode 100644
index 00000000000..2bf70a9cc19
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
@@ -0,0 +1,51 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs",
+      false,
+      QualifiedNameOfFile RangeOfBarInASingleSynMatchClauseInSynExprTryWith, [],
+      [],
+      [SynModuleOrNamespace
+         ([RangeOfBarInASingleSynMatchClauseInSynExprTryWith], false, AnonModule,
+          [Expr
+             (TryWith
+                (App
+                   (NonAtomic, false, Ident foo,
+                    Const
+                      (Unit,
+                       /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,8--3,10)),
+                    /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,4--3,10)),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (exn, None), false, None,
+                        /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,2--5,5)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,9--5,11)),
+                     /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,2--5,11),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,6--5,8)
+                       BarRange =
+                        Some
+                          /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,0--5,1) })],
+                 /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--5,11),
+                 Yes
+                   /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--2,3),
+                 Yes
+                   /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,4),
+                 { TryKeyword =
+                    /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--2,3)
+                   TryToWithRange =
+                    /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--4,4)
+                   WithKeyword =
+                    /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,4)
+                   WithToEndRange =
+                    /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--5,11) }),
+              /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--5,11))],
+          PreXmlDocEmpty, [], None,
+          /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--6,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs
rename to tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
new file mode 100644
index 00000000000..05e5c6722ed
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
@@ -0,0 +1,77 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs",
+      false,
+      QualifiedNameOfFile RangeOfBarInMultipleSynMatchClausesInSynExprMatch, [],
+      [],
+      [SynModuleOrNamespace
+         ([RangeOfBarInMultipleSynMatchClausesInSynExprMatch], false, AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--2,14),
+                 Ident foo,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([Bar], [], [None]), None, None,
+                        Pats
+                          [Named
+                             (SynIdent (bar, None), false, None,
+                              /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,6--3,9))],
+                        None,
+                        /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,2--3,9)),
+                     Some
+                       (Paren
+                          (App
+                             (NonAtomic, false, Ident someCheck, Ident bar,
+                              /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,16--3,29)),
+                           /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,15--3,16),
+                           Some
+                             /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,29--3,30),
+                           /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,15--3,30))),
+                     Const
+                       (Unit,
+                        /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,34--3,36)),
+                     /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,2--3,36),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,31--3,33)
+                       BarRange =
+                        Some
+                          /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,0--3,1) });
+                  SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([Far], [], [None]), None, None,
+                        Pats
+                          [Named
+                             (SynIdent (too, None), false, None,
+                              /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,6--4,9))],
+                        None,
+                        /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,2--4,9)),
+                     None,
+                     App
+                       (NonAtomic, false, Ident near,
+                        Const
+                          (Unit,
+                           /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,18--4,20)),
+                        /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,13--4,20)),
+                     /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,2--4,20),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,10--4,12)
+                       BarRange =
+                        Some
+                          /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,0--4,1) })],
+                 /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--4,20),
+                 { MatchKeyword =
+                    /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--2,5)
+                   WithKeyword =
+                    /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,10--2,14) }),
+              /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--4,20))],
+          PreXmlDocEmpty, [], None,
+          /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--5,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs
rename to tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl
new file mode 100644
index 00000000000..a06a32b7982
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl
@@ -0,0 +1,98 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MatchClause/RangeOfMultipleSynMatchClause.fs", false,
+      QualifiedNameOfFile RangeOfMultipleSynMatchClause, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfMultipleSynMatchClause], false, AnonModule,
+          [Expr
+             (TryWith
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (content, None), false, None,
+                           /root/MatchClause/RangeOfMultipleSynMatchClause.fs (3,8--3,15)),
+                        None,
+                        App
+                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
+                           /root/MatchClause/RangeOfMultipleSynMatchClause.fs (3,18--3,37)),
+                        /root/MatchClause/RangeOfMultipleSynMatchClause.fs (3,8--3,15),
+                        Yes
+                          /root/MatchClause/RangeOfMultipleSynMatchClause.fs (3,4--3,37),
+                        { LeadingKeyword =
+                           Let
+                             /root/MatchClause/RangeOfMultipleSynMatchClause.fs (3,4--3,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/MatchClause/RangeOfMultipleSynMatchClause.fs (3,16--3,17) })],
+                    App
+                      (NonAtomic, false, Ident Some, Ident content,
+                       /root/MatchClause/RangeOfMultipleSynMatchClause.fs (4,4--4,16)),
+                    /root/MatchClause/RangeOfMultipleSynMatchClause.fs (3,4--4,16),
+                    { InKeyword = None }),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/MatchClause/RangeOfMultipleSynMatchClause.fs (6,2--6,4)),
+                     None,
+                     Sequential
+                       (SuppressNeither, true,
+                        App
+                          (NonAtomic, false,
+                           LongIdent
+                             (false,
+                              SynLongIdent
+                                ([Infrastructure; ReportWarning],
+                                 [/root/MatchClause/RangeOfMultipleSynMatchClause.fs (7,18--7,19)],
+                                 [None; None]), None,
+                              /root/MatchClause/RangeOfMultipleSynMatchClause.fs (7,4--7,32)),
+                           Ident ex,
+                           /root/MatchClause/RangeOfMultipleSynMatchClause.fs (7,4--7,35)),
+                        Ident None,
+                        /root/MatchClause/RangeOfMultipleSynMatchClause.fs (7,4--8,8)),
+                     /root/MatchClause/RangeOfMultipleSynMatchClause.fs (6,2--8,8),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/MatchClause/RangeOfMultipleSynMatchClause.fs (6,5--6,7)
+                       BarRange =
+                        Some
+                          /root/MatchClause/RangeOfMultipleSynMatchClause.fs (6,0--6,1) });
+                  SynMatchClause
+                    (Named
+                       (SynIdent (exx, None), false, None,
+                        /root/MatchClause/RangeOfMultipleSynMatchClause.fs (9,2--9,5)),
+                     None, Ident None,
+                     /root/MatchClause/RangeOfMultipleSynMatchClause.fs (9,2--10,8),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/MatchClause/RangeOfMultipleSynMatchClause.fs (9,6--9,8)
+                       BarRange =
+                        Some
+                          /root/MatchClause/RangeOfMultipleSynMatchClause.fs (9,0--9,1) })],
+                 /root/MatchClause/RangeOfMultipleSynMatchClause.fs (2,0--10,8),
+                 Yes
+                   /root/MatchClause/RangeOfMultipleSynMatchClause.fs (2,0--2,3),
+                 Yes
+                   /root/MatchClause/RangeOfMultipleSynMatchClause.fs (5,0--5,4),
+                 { TryKeyword =
+                    /root/MatchClause/RangeOfMultipleSynMatchClause.fs (2,0--2,3)
+                   TryToWithRange =
+                    /root/MatchClause/RangeOfMultipleSynMatchClause.fs (2,0--5,4)
+                   WithKeyword =
+                    /root/MatchClause/RangeOfMultipleSynMatchClause.fs (5,0--5,4)
+                   WithToEndRange =
+                    /root/MatchClause/RangeOfMultipleSynMatchClause.fs (5,0--10,8) }),
+              /root/MatchClause/RangeOfMultipleSynMatchClause.fs (2,0--10,8))],
+          PreXmlDocEmpty, [], None,
+          /root/MatchClause/RangeOfMultipleSynMatchClause.fs (2,0--11,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs
rename to tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl
new file mode 100644
index 00000000000..0a09fe7ca1f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl
@@ -0,0 +1,81 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MatchClause/RangeOfSingleSynMatchClause.fs", false,
+      QualifiedNameOfFile RangeOfSingleSynMatchClause, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfSingleSynMatchClause], false, AnonModule,
+          [Expr
+             (TryWith
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (content, None), false, None,
+                           /root/MatchClause/RangeOfSingleSynMatchClause.fs (3,8--3,15)),
+                        None,
+                        App
+                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
+                           /root/MatchClause/RangeOfSingleSynMatchClause.fs (3,18--3,37)),
+                        /root/MatchClause/RangeOfSingleSynMatchClause.fs (3,8--3,15),
+                        Yes
+                          /root/MatchClause/RangeOfSingleSynMatchClause.fs (3,4--3,37),
+                        { LeadingKeyword =
+                           Let
+                             /root/MatchClause/RangeOfSingleSynMatchClause.fs (3,4--3,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/MatchClause/RangeOfSingleSynMatchClause.fs (3,16--3,17) })],
+                    App
+                      (NonAtomic, false, Ident Some, Ident content,
+                       /root/MatchClause/RangeOfSingleSynMatchClause.fs (4,4--4,16)),
+                    /root/MatchClause/RangeOfSingleSynMatchClause.fs (3,4--4,16),
+                    { InKeyword = None }),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/MatchClause/RangeOfSingleSynMatchClause.fs (5,5--5,7)),
+                     None,
+                     Sequential
+                       (SuppressNeither, true,
+                        App
+                          (NonAtomic, false,
+                           LongIdent
+                             (false,
+                              SynLongIdent
+                                ([Infrastructure; ReportWarning],
+                                 [/root/MatchClause/RangeOfSingleSynMatchClause.fs (6,18--6,19)],
+                                 [None; None]), None,
+                              /root/MatchClause/RangeOfSingleSynMatchClause.fs (6,4--6,32)),
+                           Ident ex,
+                           /root/MatchClause/RangeOfSingleSynMatchClause.fs (6,4--6,35)),
+                        Ident None,
+                        /root/MatchClause/RangeOfSingleSynMatchClause.fs (6,4--7,8)),
+                     /root/MatchClause/RangeOfSingleSynMatchClause.fs (5,5--7,8),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/MatchClause/RangeOfSingleSynMatchClause.fs (5,8--5,10)
+                       BarRange = None })],
+                 /root/MatchClause/RangeOfSingleSynMatchClause.fs (2,0--7,8),
+                 Yes /root/MatchClause/RangeOfSingleSynMatchClause.fs (2,0--2,3),
+                 Yes /root/MatchClause/RangeOfSingleSynMatchClause.fs (5,0--5,4),
+                 { TryKeyword =
+                    /root/MatchClause/RangeOfSingleSynMatchClause.fs (2,0--2,3)
+                   TryToWithRange =
+                    /root/MatchClause/RangeOfSingleSynMatchClause.fs (2,0--5,4)
+                   WithKeyword =
+                    /root/MatchClause/RangeOfSingleSynMatchClause.fs (5,0--5,4)
+                   WithToEndRange =
+                    /root/MatchClause/RangeOfSingleSynMatchClause.fs (5,0--7,8) }),
+              /root/MatchClause/RangeOfSingleSynMatchClause.fs (2,0--7,8))],
+          PreXmlDocEmpty, [], None,
+          /root/MatchClause/RangeOfSingleSynMatchClause.fs (2,0--8,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs
rename to tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
new file mode 100644
index 00000000000..0e400c90f8a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
@@ -0,0 +1,73 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs", false,
+      QualifiedNameOfFile RangeOfSingleSynMatchClauseFollowedByBar, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfSingleSynMatchClauseFollowedByBar], false, AnonModule,
+          [Expr
+             (TryWith
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (content, None), false, None,
+                           /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,8--3,15)),
+                        None,
+                        App
+                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
+                           /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,18--3,37)),
+                        /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,8--3,15),
+                        Yes
+                          /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,4--3,37),
+                        { LeadingKeyword =
+                           Let
+                             /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,4--3,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,16--3,17) })],
+                    App
+                      (NonAtomic, false, Ident Some, Ident content,
+                       /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (4,4--4,16)),
+                    /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,4--4,16),
+                    { InKeyword = None }),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,2--6,4)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (7,4--7,6)),
+                     /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,2--7,6),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,5--6,7)
+                       BarRange =
+                        Some
+                          /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,0--6,1) })],
+                 /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--8,1),
+                 Yes
+                   /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--2,3),
+                 Yes
+                   /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,0--5,4),
+                 { TryKeyword =
+                    /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--2,3)
+                   TryToWithRange =
+                    /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--5,4)
+                   WithKeyword =
+                    /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,0--5,4)
+                   WithToEndRange =
+                    /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,0--8,1) }),
+              /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--8,1))],
+          PreXmlDocEmpty, [], None,
+          /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--9,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs
rename to tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
new file mode 100644
index 00000000000..86332e0bc0c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
@@ -0,0 +1,71 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs", false,
+      QualifiedNameOfFile RangeOfSingleSynMatchClauseWithMissingBody, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfSingleSynMatchClauseWithMissingBody], false, AnonModule,
+          [Expr
+             (TryWith
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (content, None), false, None,
+                           /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,8--3,15)),
+                        None,
+                        App
+                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
+                           /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,18--3,37)),
+                        /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,8--3,15),
+                        Yes
+                          /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,4--3,37),
+                        { LeadingKeyword =
+                           Let
+                             /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,4--3,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,16--3,17) })],
+                    App
+                      (NonAtomic, false, Ident Some, Ident content,
+                       /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (4,4--4,16)),
+                    /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,4--4,16),
+                    { InKeyword = None }),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (6,2--6,4)),
+                     None,
+                     ArbitraryAfterError
+                       ("patternClauses2",
+                        /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (6,4--6,4)),
+                     /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (6,2--6,4),
+                     Yes,
+                     { ArrowRange = None
+                       BarRange =
+                        Some
+                          /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (6,0--6,1) })],
+                 /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--6,4),
+                 Yes
+                   /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--2,3),
+                 Yes
+                   /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,0--5,4),
+                 { TryKeyword =
+                    /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--2,3)
+                   TryToWithRange =
+                    /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--5,4)
+                   WithKeyword =
+                    /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,0--5,4)
+                   WithToEndRange =
+                    /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,0--6,4) }),
+              /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--6,4))],
+          PreXmlDocEmpty, [], None,
+          /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--7,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs
rename to tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
new file mode 100644
index 00000000000..d6d77fd9a73
--- /dev/null
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
@@ -0,0 +1,82 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs",
+      false,
+      QualifiedNameOfFile RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr,
+      [], [],
+      [SynModuleOrNamespace
+         ([RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr], false,
+          AnonModule,
+          [Expr
+             (TryWith
+                (LetOrUse
+                   (false, false,
+                    [SynBinding
+                       (None, Normal, false, false, [],
+                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                        SynValData
+                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                           None),
+                        Named
+                          (SynIdent (content, None), false, None,
+                           /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,8--3,15)),
+                        None,
+                        App
+                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
+                           /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,18--3,37)),
+                        /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,8--3,15),
+                        Yes
+                          /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,4--3,37),
+                        { LeadingKeyword =
+                           Let
+                             /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,4--3,7)
+                          InlineKeyword = None
+                          EqualsRange =
+                           Some
+                             /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,16--3,17) })],
+                    App
+                      (NonAtomic, false, Ident Some, Ident content,
+                       /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (4,4--4,16)),
+                    /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,4--4,16),
+                    { InKeyword = None }),
+                 [SynMatchClause
+                    (Named
+                       (SynIdent (ex, None), false, None,
+                        /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,2--6,4)),
+                     Some
+                       (Paren
+                          (App
+                             (NonAtomic, false, Ident isNull, Ident ex,
+                              /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,11--6,20)),
+                           /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,10--6,11),
+                           Some
+                             /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,20--6,21),
+                           /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,10--6,21))),
+                     ArbitraryAfterError
+                       ("patternClauses2",
+                        /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,21--6,21)),
+                     /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,2--6,21),
+                     Yes,
+                     { ArrowRange = None
+                       BarRange =
+                        Some
+                          /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,0--6,1) })],
+                 /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--6,21),
+                 Yes
+                   /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--2,3),
+                 Yes
+                   /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,0--5,4),
+                 { TryKeyword =
+                    /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--2,3)
+                   TryToWithRange =
+                    /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--5,4)
+                   WithKeyword =
+                    /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,0--5,4)
+                   WithToEndRange =
+                    /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,0--6,21) }),
+              /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--6,21))],
+          PreXmlDocEmpty, [], None,
+          /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--7,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs b/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs
rename to tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs
diff --git a/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl b/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl
new file mode 100644
index 00000000000..d9b15907e0b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl
@@ -0,0 +1,75 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Measure/MeasureContainsTheRangeOfTheConstant.fs", false,
+      QualifiedNameOfFile MeasureContainsTheRangeOfTheConstant, [], [],
+      [SynModuleOrNamespace
+         ([MeasureContainsTheRangeOfTheConstant], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (n, None), false, None,
+                     /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (2,4--2,5)),
+                  None,
+                  Const
+                    (Measure
+                       (Decimal 1.0M,
+                        /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (2,8--2,12),
+                        Seq
+                          ([Named
+                              ([cm],
+                               /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (2,13--2,15))],
+                           /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (2,13--2,15))),
+                     /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (2,8--2,16)),
+                  /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (2,4--2,5),
+                  Yes
+                    /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,16),
+                  { LeadingKeyword =
+                     Let
+                       /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (2,6--2,7) })],
+              /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,16));
+           Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (m, None), false, None,
+                     /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (3,4--3,5)),
+                  None,
+                  Const
+                    (Measure
+                       (Double 7.0,
+                        /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (3,8--3,13),
+                        Seq
+                          ([Named
+                              ([cm],
+                               /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (3,14--3,16))],
+                           /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (3,14--3,16))),
+                     /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (3,8--3,17)),
+                  /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (3,4--3,5),
+                  Yes
+                    /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (3,0--3,17),
+                  { LeadingKeyword =
+                     Let
+                       /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (3,0--3,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (3,6--3,7) })],
+              /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (3,0--3,17))],
+          PreXmlDocEmpty, [], None,
+          /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs b/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs
rename to tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs
diff --git a/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl
new file mode 100644
index 00000000000..3952df55d63
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl
@@ -0,0 +1,37 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Measure/SynMeasureParenHasCorrectRange.fs", false,
+      QualifiedNameOfFile SynMeasureParenHasCorrectRange, [], [],
+      [SynModuleOrNamespace
+         ([SynMeasureParenHasCorrectRange], false, AnonModule,
+          [Expr
+             (Const
+                (Measure
+                   (UInt32 40u,
+                    /root/Measure/SynMeasureParenHasCorrectRange.fs (2,0--2,3),
+                    Divide
+                      (Seq
+                         ([Named
+                             ([hr],
+                              /root/Measure/SynMeasureParenHasCorrectRange.fs (2,4--2,6))],
+                          /root/Measure/SynMeasureParenHasCorrectRange.fs (2,4--2,6)),
+                       Seq
+                         ([Paren
+                             (Seq
+                                ([Named
+                                    ([staff],
+                                     /root/Measure/SynMeasureParenHasCorrectRange.fs (2,10--2,15));
+                                  Named
+                                    ([weeks],
+                                     /root/Measure/SynMeasureParenHasCorrectRange.fs (2,16--2,21))],
+                                 /root/Measure/SynMeasureParenHasCorrectRange.fs (2,10--2,21)),
+                              /root/Measure/SynMeasureParenHasCorrectRange.fs (2,9--2,22))],
+                          /root/Measure/SynMeasureParenHasCorrectRange.fs (2,9--2,22)),
+                       /root/Measure/SynMeasureParenHasCorrectRange.fs (2,4--2,22))),
+                 /root/Measure/SynMeasureParenHasCorrectRange.fs (2,0--2,23)),
+              /root/Measure/SynMeasureParenHasCorrectRange.fs (2,0--2,23))],
+          PreXmlDocEmpty, [], None,
+          /root/Measure/SynMeasureParenHasCorrectRange.fs (2,0--2,23),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs
rename to tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
rename to tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
index b4c0166a70b..94a5fff4d21 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
+++ b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs", false,
+     ("/root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs", false,
       QualifiedNameOfFile SynTypeTupleInMeasureTypeWithLeadingSlash, [], [],
       [SynModuleOrNamespace
          ([SynTypeTupleInMeasureTypeWithLeadingSlash], false, AnonModule,
@@ -12,41 +12,41 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,2--2,9))
+                                /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,2--2,9))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,2--2,9) }]
+                             /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,2--2,9) }]
                         Range =
-                         /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,0--2,11) }],
+                         /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,0--2,11) }],
                      None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,17--2,18)),
+                     /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,17--2,18)),
                   Simple
                     (TypeAbbrev
                        (Ok,
                         Tuple
                           (false,
                            [Slash
-                              /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,21--2,22);
+                              /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,21--2,22);
                             Type
                               (LongIdent (SynLongIdent ([second], [], [None])))],
-                           /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,21--2,29)),
-                        /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,21--2,29)),
-                     /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,21--2,29)),
+                           /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,21--2,29)),
+                        /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,21--2,29)),
+                     /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,21--2,29)),
                   [], None,
-                  /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,0--2,29),
+                  /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,0--2,29),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,12--2,16)
+                       /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,12--2,16)
                     EqualsRange =
                      Some
-                       /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,19--2,20)
+                       /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,19--2,20)
                     WithKeyword = None })],
-              /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,0--2,29))],
+              /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,0--2,29))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,0--3,0),
+          /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs
rename to tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
rename to tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
index 9c26ef711ff..5fefb612dae 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
+++ b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeTupleInMeasureTypeWithNoSlashes.fs", false,
+     ("/root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs", false,
       QualifiedNameOfFile SynTypeTupleInMeasureTypeWithNoSlashes, [], [],
       [SynModuleOrNamespace
          ([SynTypeTupleInMeasureTypeWithNoSlashes], false, AnonModule,
@@ -12,17 +12,17 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,2--2,9))
+                                /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,2--2,9))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,2--2,9) }]
+                             /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,2--2,9) }]
                         Range =
-                         /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,0--2,11) }],
+                         /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,0--2,11) }],
                      None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,17--2,18)),
+                     /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,17--2,18)),
                   Simple
                     (TypeAbbrev
                        (Ok,
@@ -30,23 +30,23 @@ ImplFile
                           (false,
                            [Type (LongIdent (SynLongIdent ([Y], [], [None])));
                             Star
-                              /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,23--2,24);
+                              /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,23--2,24);
                             Type (LongIdent (SynLongIdent ([Z], [], [None])))],
-                           /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,21--2,26)),
-                        /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,21--2,26)),
-                     /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,21--2,26)),
+                           /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,21--2,26)),
+                        /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,21--2,26)),
+                     /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,21--2,26)),
                   [], None,
-                  /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,0--2,26),
+                  /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,0--2,26),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,12--2,16)
+                       /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,12--2,16)
                     EqualsRange =
                      Some
-                       /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,19--2,20)
+                       /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,19--2,20)
                     WithKeyword = None })],
-              /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,0--2,26))],
+              /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,0--2,26))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,0--3,0),
+          /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs
rename to tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
rename to tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
index 19a93b85980..eac0360fe37 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
+++ b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs", false,
+     ("/root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs", false,
       QualifiedNameOfFile SynTypeTupleInMeasureTypeWithStartAndSlash, [], [],
       [SynModuleOrNamespace
          ([SynTypeTupleInMeasureTypeWithStartAndSlash], false, AnonModule,
@@ -12,17 +12,17 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,2--2,9))
+                                /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,2--2,9))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,2--2,9) }]
+                             /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,2--2,9) }]
                         Range =
-                         /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,0--2,11) }],
+                         /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,0--2,11) }],
                      None, [], [R],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,17--2,18)),
+                     /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,17--2,18)),
                   Simple
                     (TypeAbbrev
                        (Ok,
@@ -30,26 +30,26 @@ ImplFile
                           (false,
                            [Type (LongIdent (SynLongIdent ([X], [], [None])));
                             Star
-                              /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,23--2,24);
+                              /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,23--2,24);
                             Type (LongIdent (SynLongIdent ([Y], [], [None])));
                             Slash
-                              /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,27--2,28);
+                              /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,27--2,28);
                             Type (LongIdent (SynLongIdent ([Z], [], [None])))],
-                           /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,21--2,30)),
-                        /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,21--2,30)),
-                     /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,21--2,30)),
+                           /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,21--2,30)),
+                        /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,21--2,30)),
+                     /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,21--2,30)),
                   [], None,
-                  /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,0--2,30),
+                  /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,0--2,30),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,12--2,16)
+                       /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,12--2,16)
                     EqualsRange =
                      Some
-                       /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,19--2,20)
+                       /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,19--2,20)
                     WithKeyword = None })],
-              /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,0--2,30))],
+              /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,0--2,30))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,0--3,0),
+          /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs.bsl b/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs.bsl
deleted file mode 100644
index caca879b975..00000000000
--- a/tests/service/data/SyntaxTree/MeasureContainsTheRangeOfTheConstant.fs.bsl
+++ /dev/null
@@ -1,73 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/MeasureContainsTheRangeOfTheConstant.fs", false,
-      QualifiedNameOfFile MeasureContainsTheRangeOfTheConstant, [], [],
-      [SynModuleOrNamespace
-         ([MeasureContainsTheRangeOfTheConstant], false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (n, None), false, None,
-                     /root/MeasureContainsTheRangeOfTheConstant.fs (2,4--2,5)),
-                  None,
-                  Const
-                    (Measure
-                       (Decimal 1.0M,
-                        /root/MeasureContainsTheRangeOfTheConstant.fs (2,8--2,12),
-                        Seq
-                          ([Named
-                              ([cm],
-                               /root/MeasureContainsTheRangeOfTheConstant.fs (2,13--2,15))],
-                           /root/MeasureContainsTheRangeOfTheConstant.fs (2,13--2,15))),
-                     /root/MeasureContainsTheRangeOfTheConstant.fs (2,8--2,16)),
-                  /root/MeasureContainsTheRangeOfTheConstant.fs (2,4--2,5),
-                  Yes /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,16),
-                  { LeadingKeyword =
-                     Let
-                       /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some
-                       /root/MeasureContainsTheRangeOfTheConstant.fs (2,6--2,7) })],
-              /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--2,16));
-           Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (m, None), false, None,
-                     /root/MeasureContainsTheRangeOfTheConstant.fs (3,4--3,5)),
-                  None,
-                  Const
-                    (Measure
-                       (Double 7.0,
-                        /root/MeasureContainsTheRangeOfTheConstant.fs (3,8--3,13),
-                        Seq
-                          ([Named
-                              ([cm],
-                               /root/MeasureContainsTheRangeOfTheConstant.fs (3,14--3,16))],
-                           /root/MeasureContainsTheRangeOfTheConstant.fs (3,14--3,16))),
-                     /root/MeasureContainsTheRangeOfTheConstant.fs (3,8--3,17)),
-                  /root/MeasureContainsTheRangeOfTheConstant.fs (3,4--3,5),
-                  Yes /root/MeasureContainsTheRangeOfTheConstant.fs (3,0--3,17),
-                  { LeadingKeyword =
-                     Let
-                       /root/MeasureContainsTheRangeOfTheConstant.fs (3,0--3,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some
-                       /root/MeasureContainsTheRangeOfTheConstant.fs (3,6--3,7) })],
-              /root/MeasureContainsTheRangeOfTheConstant.fs (3,0--3,17))],
-          PreXmlDocEmpty, [], None,
-          /root/MeasureContainsTheRangeOfTheConstant.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs b/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs
rename to tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs
diff --git a/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl
similarity index 62%
rename from tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl
index e1bff5838b3..6107aa6e2fe 100644
--- a/tests/service/data/SyntaxTree/GetSetMemberWithInlineKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/GetSetMemberWithInlineKeyword.fs", false,
+     ("/root/Member/GetSetMemberWithInlineKeyword.fs", false,
       QualifiedNameOfFile GetSetMemberWithInlineKeyword, [], [],
       [SynModuleOrNamespace
          ([GetSetMemberWithInlineKeyword], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/GetSetMemberWithInlineKeyword.fs (2,5--2,6)),
+                     /root/Member/GetSetMemberWithInlineKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [GetSetMember
@@ -33,31 +33,31 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([x; Y],
-                                     [/root/GetSetMemberWithInlineKeyword.fs (3,19--3,20)],
+                                     [/root/Member/GetSetMemberWithInlineKeyword.fs (3,19--3,20)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/GetSetMemberWithInlineKeyword.fs (4,24--4,26)),
-                                        /root/GetSetMemberWithInlineKeyword.fs (4,24--4,26))],
+                                           /root/Member/GetSetMemberWithInlineKeyword.fs (4,24--4,26)),
+                                        /root/Member/GetSetMemberWithInlineKeyword.fs (4,24--4,26))],
                                   None,
-                                  /root/GetSetMemberWithInlineKeyword.fs (4,20--4,26)),
+                                  /root/Member/GetSetMemberWithInlineKeyword.fs (4,20--4,26)),
                                None,
                                Const
                                  (Int32 4,
-                                  /root/GetSetMemberWithInlineKeyword.fs (4,29--4,30)),
-                               /root/GetSetMemberWithInlineKeyword.fs (4,20--4,26),
+                                  /root/Member/GetSetMemberWithInlineKeyword.fs (4,29--4,30)),
+                               /root/Member/GetSetMemberWithInlineKeyword.fs (4,20--4,26),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/GetSetMemberWithInlineKeyword.fs (3,4--3,10)
+                                    /root/Member/GetSetMemberWithInlineKeyword.fs (3,4--3,10)
                                  InlineKeyword =
                                   Some
-                                    /root/GetSetMemberWithInlineKeyword.fs (4,13--4,19)
+                                    /root/Member/GetSetMemberWithInlineKeyword.fs (4,13--4,19)
                                  EqualsRange =
                                   Some
-                                    /root/GetSetMemberWithInlineKeyword.fs (4,27--4,28) })),
+                                    /root/Member/GetSetMemberWithInlineKeyword.fs (4,27--4,28) })),
                          Some
                            (SynBinding
                               (None, Normal, true, false, [],
@@ -78,54 +78,57 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([x; Y],
-                                     [/root/GetSetMemberWithInlineKeyword.fs (3,19--3,20)],
+                                     [/root/Member/GetSetMemberWithInlineKeyword.fs (3,19--3,20)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Named
                                        (SynIdent (y, None), false, None,
-                                        /root/GetSetMemberWithInlineKeyword.fs (5,23--5,24))],
+                                        /root/Member/GetSetMemberWithInlineKeyword.fs (5,23--5,24))],
                                   None,
-                                  /root/GetSetMemberWithInlineKeyword.fs (5,19--5,24)),
+                                  /root/Member/GetSetMemberWithInlineKeyword.fs (5,19--5,24)),
                                None,
                                Const
                                  (Unit,
-                                  /root/GetSetMemberWithInlineKeyword.fs (5,27--5,29)),
-                               /root/GetSetMemberWithInlineKeyword.fs (5,19--5,24),
+                                  /root/Member/GetSetMemberWithInlineKeyword.fs (5,27--5,29)),
+                               /root/Member/GetSetMemberWithInlineKeyword.fs (5,19--5,24),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/GetSetMemberWithInlineKeyword.fs (3,4--3,10)
+                                    /root/Member/GetSetMemberWithInlineKeyword.fs (3,4--3,10)
                                  InlineKeyword =
                                   Some
-                                    /root/GetSetMemberWithInlineKeyword.fs (5,12--5,18)
+                                    /root/Member/GetSetMemberWithInlineKeyword.fs (5,12--5,18)
                                  EqualsRange =
                                   Some
-                                    /root/GetSetMemberWithInlineKeyword.fs (5,25--5,26) })),
-                         /root/GetSetMemberWithInlineKeyword.fs (3,4--5,29),
+                                    /root/Member/GetSetMemberWithInlineKeyword.fs (5,25--5,26) })),
+                         /root/Member/GetSetMemberWithInlineKeyword.fs (3,4--5,29),
                          { InlineKeyword =
                             Some
-                              /root/GetSetMemberWithInlineKeyword.fs (3,11--3,17)
+                              /root/Member/GetSetMemberWithInlineKeyword.fs (3,11--3,17)
                            WithKeyword =
-                            /root/GetSetMemberWithInlineKeyword.fs (4,8--4,12)
+                            /root/Member/GetSetMemberWithInlineKeyword.fs (4,8--4,12)
                            GetKeyword =
                             Some
-                              /root/GetSetMemberWithInlineKeyword.fs (4,20--4,23)
+                              /root/Member/GetSetMemberWithInlineKeyword.fs (4,20--4,23)
                            AndKeyword =
                             Some
-                              /root/GetSetMemberWithInlineKeyword.fs (5,8--5,11)
+                              /root/Member/GetSetMemberWithInlineKeyword.fs (5,8--5,11)
                            SetKeyword =
                             Some
-                              /root/GetSetMemberWithInlineKeyword.fs (5,19--5,22) })],
-                     /root/GetSetMemberWithInlineKeyword.fs (3,4--5,29)), [],
-                  None, /root/GetSetMemberWithInlineKeyword.fs (2,5--5,29),
+                              /root/Member/GetSetMemberWithInlineKeyword.fs (5,19--5,22) })],
+                     /root/Member/GetSetMemberWithInlineKeyword.fs (3,4--5,29)),
+                  [], None,
+                  /root/Member/GetSetMemberWithInlineKeyword.fs (2,5--5,29),
                   { LeadingKeyword =
-                     Type /root/GetSetMemberWithInlineKeyword.fs (2,0--2,4)
+                     Type
+                       /root/Member/GetSetMemberWithInlineKeyword.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/GetSetMemberWithInlineKeyword.fs (2,7--2,8)
+                     Some
+                       /root/Member/GetSetMemberWithInlineKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/GetSetMemberWithInlineKeyword.fs (2,0--5,29))],
+              /root/Member/GetSetMemberWithInlineKeyword.fs (2,0--5,29))],
           PreXmlDocEmpty, [], None,
-          /root/GetSetMemberWithInlineKeyword.fs (2,0--6,0),
+          /root/Member/GetSetMemberWithInlineKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs b/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs
rename to tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs
diff --git a/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl
similarity index 51%
rename from tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl
index b9bdfa35c56..163b39e3c0e 100644
--- a/tests/service/data/SyntaxTree/ImplicitCtorWithAsKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/ImplicitCtorWithAsKeyword.fs", false,
+     ("/root/Member/ImplicitCtorWithAsKeyword.fs", false,
       QualifiedNameOfFile ImplicitCtorWithAsKeyword, [], [],
       [SynModuleOrNamespace
          ([ImplicitCtorWithAsKeyword], false, AnonModule,
@@ -11,8 +11,9 @@ ImplFile
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false,
                      Some
-                       (Internal /root/ImplicitCtorWithAsKeyword.fs (2,5--2,13)),
-                     /root/ImplicitCtorWithAsKeyword.fs (2,14--2,32)),
+                       (Internal
+                          /root/Member/ImplicitCtorWithAsKeyword.fs (2,5--2,13)),
+                     /root/Member/ImplicitCtorWithAsKeyword.fs (2,14--2,32)),
                   ObjectModel
                     (Class,
                      [ImplicitCtor
@@ -21,7 +22,7 @@ ImplFile
                            ([Typed
                                (Id
                                   (readAllBytes, None, false, false, false,
-                                   /root/ImplicitCtorWithAsKeyword.fs (2,33--2,45)),
+                                   /root/Member/ImplicitCtorWithAsKeyword.fs (2,33--2,45)),
                                 Fun
                                   (LongIdent
                                      (SynLongIdent ([string], [], [None])),
@@ -29,26 +30,27 @@ ImplFile
                                      (1,
                                       LongIdent
                                         (SynLongIdent ([byte], [], [None])),
-                                      /root/ImplicitCtorWithAsKeyword.fs (2,57--2,63)),
-                                   /root/ImplicitCtorWithAsKeyword.fs (2,47--2,63),
+                                      /root/Member/ImplicitCtorWithAsKeyword.fs (2,57--2,63)),
+                                   /root/Member/ImplicitCtorWithAsKeyword.fs (2,47--2,63),
                                    { ArrowRange =
-                                      /root/ImplicitCtorWithAsKeyword.fs (2,54--2,56) }),
-                                /root/ImplicitCtorWithAsKeyword.fs (2,33--2,63));
+                                      /root/Member/ImplicitCtorWithAsKeyword.fs (2,54--2,56) }),
+                                /root/Member/ImplicitCtorWithAsKeyword.fs (2,33--2,63));
                              Typed
                                (Id
                                   (projectOptions, None, false, false, false,
-                                   /root/ImplicitCtorWithAsKeyword.fs (2,65--2,79)),
+                                   /root/Member/ImplicitCtorWithAsKeyword.fs (2,65--2,79)),
                                 LongIdent
                                   (SynLongIdent
                                      ([FSharpProjectOptions], [], [None])),
-                                /root/ImplicitCtorWithAsKeyword.fs (2,65--2,101))],
-                            /root/ImplicitCtorWithAsKeyword.fs (2,32--2,102)),
+                                /root/Member/ImplicitCtorWithAsKeyword.fs (2,65--2,101))],
+                            /root/Member/ImplicitCtorWithAsKeyword.fs (2,32--2,102)),
                          Some this,
                          PreXmlDoc ((2,32), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/ImplicitCtorWithAsKeyword.fs (2,14--2,32),
+                         /root/Member/ImplicitCtorWithAsKeyword.fs (2,14--2,32),
                          { AsKeyword =
-                            Some /root/ImplicitCtorWithAsKeyword.fs (4,4--4,6) })],
-                     /root/ImplicitCtorWithAsKeyword.fs (8,4--8,13)), [],
+                            Some
+                              /root/Member/ImplicitCtorWithAsKeyword.fs (4,4--4,6) })],
+                     /root/Member/ImplicitCtorWithAsKeyword.fs (8,4--8,13)), [],
                   Some
                     (ImplicitCtor
                        (None, [],
@@ -56,7 +58,7 @@ ImplFile
                           ([Typed
                               (Id
                                  (readAllBytes, None, false, false, false,
-                                  /root/ImplicitCtorWithAsKeyword.fs (2,33--2,45)),
+                                  /root/Member/ImplicitCtorWithAsKeyword.fs (2,33--2,45)),
                                Fun
                                  (LongIdent
                                     (SynLongIdent ([string], [], [None])),
@@ -64,37 +66,40 @@ ImplFile
                                     (1,
                                      LongIdent
                                        (SynLongIdent ([byte], [], [None])),
-                                     /root/ImplicitCtorWithAsKeyword.fs (2,57--2,63)),
-                                  /root/ImplicitCtorWithAsKeyword.fs (2,47--2,63),
+                                     /root/Member/ImplicitCtorWithAsKeyword.fs (2,57--2,63)),
+                                  /root/Member/ImplicitCtorWithAsKeyword.fs (2,47--2,63),
                                   { ArrowRange =
-                                     /root/ImplicitCtorWithAsKeyword.fs (2,54--2,56) }),
-                               /root/ImplicitCtorWithAsKeyword.fs (2,33--2,63));
+                                     /root/Member/ImplicitCtorWithAsKeyword.fs (2,54--2,56) }),
+                               /root/Member/ImplicitCtorWithAsKeyword.fs (2,33--2,63));
                             Typed
                               (Id
                                  (projectOptions, None, false, false, false,
-                                  /root/ImplicitCtorWithAsKeyword.fs (2,65--2,79)),
+                                  /root/Member/ImplicitCtorWithAsKeyword.fs (2,65--2,79)),
                                LongIdent
                                  (SynLongIdent
                                     ([FSharpProjectOptions], [], [None])),
-                               /root/ImplicitCtorWithAsKeyword.fs (2,65--2,101))],
-                           /root/ImplicitCtorWithAsKeyword.fs (2,32--2,102)),
+                               /root/Member/ImplicitCtorWithAsKeyword.fs (2,65--2,101))],
+                           /root/Member/ImplicitCtorWithAsKeyword.fs (2,32--2,102)),
                         Some this,
                         PreXmlDoc ((2,32), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/ImplicitCtorWithAsKeyword.fs (2,14--2,32),
+                        /root/Member/ImplicitCtorWithAsKeyword.fs (2,14--2,32),
                         { AsKeyword =
-                           Some /root/ImplicitCtorWithAsKeyword.fs (4,4--4,6) })),
-                  /root/ImplicitCtorWithAsKeyword.fs (2,5--8,13),
+                           Some
+                             /root/Member/ImplicitCtorWithAsKeyword.fs (4,4--4,6) })),
+                  /root/Member/ImplicitCtorWithAsKeyword.fs (2,5--8,13),
                   { LeadingKeyword =
-                     Type /root/ImplicitCtorWithAsKeyword.fs (2,0--2,4)
+                     Type /root/Member/ImplicitCtorWithAsKeyword.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/ImplicitCtorWithAsKeyword.fs (4,12--4,13)
+                     Some /root/Member/ImplicitCtorWithAsKeyword.fs (4,12--4,13)
                     WithKeyword = None })],
-              /root/ImplicitCtorWithAsKeyword.fs (2,0--8,13))], PreXmlDocEmpty,
-          [], None, /root/ImplicitCtorWithAsKeyword.fs (2,0--9,0),
+              /root/Member/ImplicitCtorWithAsKeyword.fs (2,0--8,13))],
+          PreXmlDocEmpty, [], None,
+          /root/Member/ImplicitCtorWithAsKeyword.fs (2,0--9,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/ImplicitCtorWithAsKeyword.fs (3,0--3,23);
-          LineComment /root/ImplicitCtorWithAsKeyword.fs (5,0--5,7);
-          LineComment /root/ImplicitCtorWithAsKeyword.fs (6,0--6,8);
-          LineComment /root/ImplicitCtorWithAsKeyword.fs (7,0--7,9)] }, set []))
\ No newline at end of file
+         [LineComment /root/Member/ImplicitCtorWithAsKeyword.fs (3,0--3,23);
+          LineComment /root/Member/ImplicitCtorWithAsKeyword.fs (5,0--5,7);
+          LineComment /root/Member/ImplicitCtorWithAsKeyword.fs (6,0--6,8);
+          LineComment /root/Member/ImplicitCtorWithAsKeyword.fs (7,0--7,9)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs b/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs
rename to tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs
diff --git a/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl
similarity index 60%
rename from tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl
index a4083e1c692..f5f76ca871c 100644
--- a/tests/service/data/SyntaxTree/MemberWithInlineKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/MemberWithInlineKeyword.fs", false,
+     ("/root/Member/MemberWithInlineKeyword.fs", false,
       QualifiedNameOfFile MemberWithInlineKeyword, [], [],
       [SynModuleOrNamespace
          ([MemberWithInlineKeyword], false, AnonModule,
@@ -9,7 +9,8 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/MemberWithInlineKeyword.fs (2,5--2,6)),
+                     false, None,
+                     /root/Member/MemberWithInlineKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -29,41 +30,42 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([x; Y],
-                                  [/root/MemberWithInlineKeyword.fs (3,19--3,20)],
+                                  [/root/Member/MemberWithInlineKeyword.fs (3,19--3,20)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/MemberWithInlineKeyword.fs (3,22--3,24)),
-                                     /root/MemberWithInlineKeyword.fs (3,22--3,24))],
+                                        /root/Member/MemberWithInlineKeyword.fs (3,22--3,24)),
+                                     /root/Member/MemberWithInlineKeyword.fs (3,22--3,24))],
                                None,
-                               /root/MemberWithInlineKeyword.fs (3,18--3,24)),
+                               /root/Member/MemberWithInlineKeyword.fs (3,18--3,24)),
                             None,
                             Const
                               (Unit,
-                               /root/MemberWithInlineKeyword.fs (3,27--3,29)),
-                            /root/MemberWithInlineKeyword.fs (3,18--3,24),
+                               /root/Member/MemberWithInlineKeyword.fs (3,27--3,29)),
+                            /root/Member/MemberWithInlineKeyword.fs (3,18--3,24),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/MemberWithInlineKeyword.fs (3,4--3,10)
+                                 /root/Member/MemberWithInlineKeyword.fs (3,4--3,10)
                               InlineKeyword =
                                Some
-                                 /root/MemberWithInlineKeyword.fs (3,11--3,17)
+                                 /root/Member/MemberWithInlineKeyword.fs (3,11--3,17)
                               EqualsRange =
                                Some
-                                 /root/MemberWithInlineKeyword.fs (3,25--3,26) }),
-                         /root/MemberWithInlineKeyword.fs (3,4--3,29))],
-                     /root/MemberWithInlineKeyword.fs (3,4--3,29)), [], None,
-                  /root/MemberWithInlineKeyword.fs (2,5--3,29),
+                                 /root/Member/MemberWithInlineKeyword.fs (3,25--3,26) }),
+                         /root/Member/MemberWithInlineKeyword.fs (3,4--3,29))],
+                     /root/Member/MemberWithInlineKeyword.fs (3,4--3,29)), [],
+                  None, /root/Member/MemberWithInlineKeyword.fs (2,5--3,29),
                   { LeadingKeyword =
-                     Type /root/MemberWithInlineKeyword.fs (2,0--2,4)
+                     Type /root/Member/MemberWithInlineKeyword.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/MemberWithInlineKeyword.fs (2,7--2,8)
+                     Some /root/Member/MemberWithInlineKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/MemberWithInlineKeyword.fs (2,0--3,29))], PreXmlDocEmpty, [],
-          None, /root/MemberWithInlineKeyword.fs (2,0--4,0),
+              /root/Member/MemberWithInlineKeyword.fs (2,0--3,29))],
+          PreXmlDocEmpty, [], None,
+          /root/Member/MemberWithInlineKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
rename to tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
similarity index 55%
rename from tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
index a4d6ce903fc..e1d4a0e5bfa 100644
--- a/tests/service/data/SyntaxTree/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs",
+     ("/root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs",
       false,
       QualifiedNameOfFile
         Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword,
@@ -14,17 +14,17 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
+                     /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
+                            /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                          None,
                          PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
+                         /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                          { AsKeyword = None });
                       GetSetMember
                         (Some
@@ -46,62 +46,62 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadProperty],
-                                     [/root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,15--4,16)],
+                                     [/root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,15--4,16)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,40--4,42)),
-                                        /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,40--4,42))],
+                                           /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,40--4,42)),
+                                        /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,40--4,42))],
                                   None,
-                                  /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,36--4,42)),
+                                  /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,36--4,42)),
                                None, Ident myInternalValue,
-                               /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,36--4,42),
+                               /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,36--4,42),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
+                                    /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,43--4,44) })),
+                                    /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,43--4,44) })),
                          None,
-                         /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,60),
+                         /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,60),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,31--4,35)
+                            /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,31--4,35)
                            GetKeyword =
                             Some
-                              /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,36--4,39)
+                              /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,36--4,39)
                            AndKeyword = None
                            SetKeyword = None })],
-                     /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,60)),
+                     /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,60)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
+                           /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                         None,
                         PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
+                        /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                         { AsKeyword = None })),
-                  /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--4,60),
+                  /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--4,60),
                   { LeadingKeyword =
                      Type
-                       /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
+                       /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
+                       /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--4,60))],
+              /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--4,60))],
           PreXmlDocEmpty, [], None,
-          /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--5,0),
+          /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,28)] },
+            /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,28)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
rename to tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
similarity index 56%
rename from tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
index ec6f913b7ec..5e032ba16ae 100644
--- a/tests/service/data/SyntaxTree/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs",
+     ("/root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs",
       false,
       QualifiedNameOfFile
         ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword,
@@ -14,17 +14,17 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
+                     /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
+                            /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                          None,
                          PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
+                         /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                          { AsKeyword = None });
                       GetSetMember
                         (Some
@@ -46,26 +46,26 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadWriteProperty],
-                                     [/root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,15--4,16)],
+                                     [/root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,15--4,16)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,17--5,19)),
-                                        /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,17--5,19))],
+                                           /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,17--5,19)),
+                                        /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,17--5,19))],
                                   None,
-                                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,13--5,19)),
+                                  /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,13--5,19)),
                                None, Ident myInternalValue,
-                               /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,13--5,19),
+                               /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,13--5,19),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
+                                    /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,20--5,21) })),
+                                    /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,20--5,21) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false, [],
@@ -86,69 +86,69 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadWriteProperty],
-                                     [/root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,15--4,16)],
+                                     [/root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,15--4,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Named
                                           (SynIdent (value, None), false, None,
-                                           /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,17--6,22)),
-                                        /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,16--6,23))],
+                                           /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,17--6,22)),
+                                        /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,16--6,23))],
                                   None,
-                                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,12--6,23)),
+                                  /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,12--6,23)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([myInternalValue], [], [None]),
                                   Ident value,
-                                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,26--6,50)),
-                               /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,12--6,23),
+                                  /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,26--6,50)),
+                               /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,12--6,23),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
+                                    /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,24--6,25) })),
-                         /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--6,50),
+                                    /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,24--6,25) })),
+                         /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--6,50),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,8--5,12)
+                            /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,8--5,12)
                            GetKeyword =
                             Some
-                              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,13--5,16)
+                              /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (5,13--5,16)
                            AndKeyword =
                             Some
-                              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,8--6,11)
+                              /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,8--6,11)
                            SetKeyword =
                             Some
-                              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,12--6,15) })],
-                     /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--6,50)),
+                              /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (6,12--6,15) })],
+                     /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--6,50)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
+                           /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                         None,
                         PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
+                        /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                         { AsKeyword = None })),
-                  /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--6,50),
+                  /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--6,50),
                   { LeadingKeyword =
                      Type
-                       /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
+                       /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
+                       /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--6,50))],
+              /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--6,50))],
           PreXmlDocEmpty, [], None,
-          /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--7,0),
+          /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,29)] },
+            /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,29)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi b/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi
rename to tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi.bsl b/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl
similarity index 58%
rename from tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi.bsl
rename to tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl
index e7f98f7ac9a..eacde96eebe 100644
--- a/tests/service/data/SyntaxTree/SignatureMemberWithGet.fsi.bsl
+++ b/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/SignatureMemberWithGet.fsi", QualifiedNameOfFile Meh, [], [],
+     ("/root/Member/SignatureMemberWithGet.fsi", QualifiedNameOfFile Meh, [], [],
       [SynModuleOrNamespaceSig
          ([Meh], false, NamedModule,
           [Types
@@ -8,7 +8,8 @@ SigFile
                  (SynComponentInfo
                     ([], None, [], [X],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/SignatureMemberWithGet.fsi (4,5--4,6)),
+                     false, None,
+                     /root/Member/SignatureMemberWithGet.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -20,14 +21,14 @@ SigFile
                             false,
                             PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SignatureMemberWithGet.fsi (6,4--8,35),
+                            /root/Member/SignatureMemberWithGet.fsi (6,4--8,35),
                             { LeadingKeyword =
                                Member
-                                 /root/SignatureMemberWithGet.fsi (6,4--6,10)
+                                 /root/Member/SignatureMemberWithGet.fsi (6,4--6,10)
                               InlineKeyword = None
                               WithKeyword =
                                Some
-                                 /root/SignatureMemberWithGet.fsi (7,20--7,24)
+                                 /root/Member/SignatureMemberWithGet.fsi (7,20--7,24)
                               EqualsRange = None }),
                          { IsInstance = true
                            IsDispatchSlot = false
@@ -35,21 +36,24 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SignatureMemberWithGet.fsi (6,4--8,35),
+                         /root/Member/SignatureMemberWithGet.fsi (6,4--8,35),
                          { GetSetKeywords =
                             Some
-                              (Get /root/SignatureMemberWithGet.fsi (8,32--8,35)) })],
-                     /root/SignatureMemberWithGet.fsi (6,4--8,35)), [],
-                  /root/SignatureMemberWithGet.fsi (4,5--8,35),
+                              (Get
+                                 /root/Member/SignatureMemberWithGet.fsi (8,32--8,35)) })],
+                     /root/Member/SignatureMemberWithGet.fsi (6,4--8,35)), [],
+                  /root/Member/SignatureMemberWithGet.fsi (4,5--8,35),
                   { LeadingKeyword =
-                     Type /root/SignatureMemberWithGet.fsi (4,0--4,4)
+                     Type /root/Member/SignatureMemberWithGet.fsi (4,0--4,4)
                     EqualsRange =
-                     Some /root/SignatureMemberWithGet.fsi (4,7--4,8)
+                     Some /root/Member/SignatureMemberWithGet.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/SignatureMemberWithGet.fsi (4,0--8,35))],
+              /root/Member/SignatureMemberWithGet.fsi (4,0--8,35))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/SignatureMemberWithGet.fsi (2,0--8,35),
-          { LeadingKeyword = Module /root/SignatureMemberWithGet.fsi (2,0--2,6) })],
+          /root/Member/SignatureMemberWithGet.fsi (2,0--8,35),
+          { LeadingKeyword =
+             Module /root/Member/SignatureMemberWithGet.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/SignatureMemberWithGet.fsi (5,4--5,23)] }, set []))
\ No newline at end of file
+         [LineComment /root/Member/SignatureMemberWithGet.fsi (5,4--5,23)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi
rename to tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi.bsl b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl
similarity index 58%
rename from tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi.bsl
rename to tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl
index 64ac81c24f9..dc42a0ff120 100644
--- a/tests/service/data/SyntaxTree/SignatureMemberWithSet.fsi.bsl
+++ b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/SignatureMemberWithSet.fsi", QualifiedNameOfFile Meh, [], [],
+     ("/root/Member/SignatureMemberWithSet.fsi", QualifiedNameOfFile Meh, [], [],
       [SynModuleOrNamespaceSig
          ([Meh], false, NamedModule,
           [Types
@@ -8,7 +8,8 @@ SigFile
                  (SynComponentInfo
                     ([], None, [], [X],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/SignatureMemberWithSet.fsi (4,5--4,6)),
+                     false, None,
+                     /root/Member/SignatureMemberWithSet.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -20,14 +21,14 @@ SigFile
                             false,
                             PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SignatureMemberWithSet.fsi (6,4--8,31),
+                            /root/Member/SignatureMemberWithSet.fsi (6,4--8,31),
                             { LeadingKeyword =
                                Member
-                                 /root/SignatureMemberWithSet.fsi (6,4--6,10)
+                                 /root/Member/SignatureMemberWithSet.fsi (6,4--6,10)
                               InlineKeyword = None
                               WithKeyword =
                                Some
-                                 /root/SignatureMemberWithSet.fsi (7,20--7,24)
+                                 /root/Member/SignatureMemberWithSet.fsi (7,20--7,24)
                               EqualsRange = None }),
                          { IsInstance = true
                            IsDispatchSlot = false
@@ -35,21 +36,24 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertySet },
-                         /root/SignatureMemberWithSet.fsi (6,4--8,31),
+                         /root/Member/SignatureMemberWithSet.fsi (6,4--8,31),
                          { GetSetKeywords =
                             Some
-                              (Set /root/SignatureMemberWithSet.fsi (8,28--8,31)) })],
-                     /root/SignatureMemberWithSet.fsi (6,4--8,31)), [],
-                  /root/SignatureMemberWithSet.fsi (4,5--8,31),
+                              (Set
+                                 /root/Member/SignatureMemberWithSet.fsi (8,28--8,31)) })],
+                     /root/Member/SignatureMemberWithSet.fsi (6,4--8,31)), [],
+                  /root/Member/SignatureMemberWithSet.fsi (4,5--8,31),
                   { LeadingKeyword =
-                     Type /root/SignatureMemberWithSet.fsi (4,0--4,4)
+                     Type /root/Member/SignatureMemberWithSet.fsi (4,0--4,4)
                     EqualsRange =
-                     Some /root/SignatureMemberWithSet.fsi (4,7--4,8)
+                     Some /root/Member/SignatureMemberWithSet.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/SignatureMemberWithSet.fsi (4,0--8,31))],
+              /root/Member/SignatureMemberWithSet.fsi (4,0--8,31))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/SignatureMemberWithSet.fsi (2,0--8,31),
-          { LeadingKeyword = Module /root/SignatureMemberWithSet.fsi (2,0--2,6) })],
+          /root/Member/SignatureMemberWithSet.fsi (2,0--8,31),
+          { LeadingKeyword =
+             Module /root/Member/SignatureMemberWithSet.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/SignatureMemberWithSet.fsi (5,4--5,23)] }, set []))
\ No newline at end of file
+         [LineComment /root/Member/SignatureMemberWithSet.fsi (5,4--5,23)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi
rename to tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi
diff --git a/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi.bsl b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl
similarity index 59%
rename from tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi.bsl
rename to tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl
index 0be2e9e4245..2f829329a3f 100644
--- a/tests/service/data/SyntaxTree/SignatureMemberWithSet,get.fsi.bsl
+++ b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl
@@ -1,6 +1,7 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/SignatureMemberWithSet,get.fsi", QualifiedNameOfFile Meh, [], [],
+     ("/root/Member/SignatureMemberWithSetget.fsi", QualifiedNameOfFile Meh, [],
+      [],
       [SynModuleOrNamespaceSig
          ([Meh], false, NamedModule,
           [Types
@@ -9,7 +10,7 @@ SigFile
                     ([], None, [], [X],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SignatureMemberWithSet,get.fsi (4,5--4,6)),
+                     /root/Member/SignatureMemberWithSetget.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -21,14 +22,14 @@ SigFile
                             false,
                             PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SignatureMemberWithSet,get.fsi (6,4--8,39),
+                            /root/Member/SignatureMemberWithSetget.fsi (6,4--8,39),
                             { LeadingKeyword =
                                Member
-                                 /root/SignatureMemberWithSet,get.fsi (6,4--6,10)
+                                 /root/Member/SignatureMemberWithSetget.fsi (6,4--6,10)
                               InlineKeyword = None
                               WithKeyword =
                                Some
-                                 /root/SignatureMemberWithSet,get.fsi (7,20--7,24)
+                                 /root/Member/SignatureMemberWithSetget.fsi (7,20--7,24)
                               EqualsRange = None }),
                          { IsInstance = true
                            IsDispatchSlot = false
@@ -36,25 +37,25 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGetSet },
-                         /root/SignatureMemberWithSet,get.fsi (6,4--8,39),
+                         /root/Member/SignatureMemberWithSetget.fsi (6,4--8,39),
                          { GetSetKeywords =
                             Some
                               (GetSet
-                                 (/root/SignatureMemberWithSet,get.fsi (8,36--8,39),
-                                  /root/SignatureMemberWithSet,get.fsi (8,28--8,31))) })],
-                     /root/SignatureMemberWithSet,get.fsi (6,4--8,39)), [],
-                  /root/SignatureMemberWithSet,get.fsi (4,5--8,39),
+                                 (/root/Member/SignatureMemberWithSetget.fsi (8,36--8,39),
+                                  /root/Member/SignatureMemberWithSetget.fsi (8,28--8,31))) })],
+                     /root/Member/SignatureMemberWithSetget.fsi (6,4--8,39)), [],
+                  /root/Member/SignatureMemberWithSetget.fsi (4,5--8,39),
                   { LeadingKeyword =
-                     Type /root/SignatureMemberWithSet,get.fsi (4,0--4,4)
+                     Type /root/Member/SignatureMemberWithSetget.fsi (4,0--4,4)
                     EqualsRange =
-                     Some /root/SignatureMemberWithSet,get.fsi (4,7--4,8)
+                     Some /root/Member/SignatureMemberWithSetget.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/SignatureMemberWithSet,get.fsi (4,0--8,39))],
+              /root/Member/SignatureMemberWithSetget.fsi (4,0--8,39))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/SignatureMemberWithSet,get.fsi (2,0--8,39),
+          /root/Member/SignatureMemberWithSetget.fsi (2,0--8,39),
           { LeadingKeyword =
-             Module /root/SignatureMemberWithSet,get.fsi (2,0--2,6) })],
+             Module /root/Member/SignatureMemberWithSetget.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/SignatureMemberWithSet,get.fsi (5,4--5,23)] },
+         [LineComment /root/Member/SignatureMemberWithSetget.fsi (5,4--5,23)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs
rename to tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
similarity index 56%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
index 3cbb7010851..f06287b51ba 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs",
+     ("/root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs",
       false,
       QualifiedNameOfFile
         SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword, [], [],
@@ -13,17 +13,17 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
+                     /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
+                            /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                          None,
                          PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
+                         /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                          { AsKeyword = None });
                       AbstractSlot
                         (SynValSig
@@ -34,15 +34,15 @@ ImplFile
                             false,
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,4--3,42),
+                            /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,4--3,42),
                             { LeadingKeyword =
                                AbstractMember
-                                 (/root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,4--3,12),
-                                  /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,13--3,19))
+                                 (/root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,4--3,12),
+                                  /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,13--3,19))
                               InlineKeyword = None
                               WithKeyword =
                                Some
-                                 /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,30--3,34)
+                                 /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,30--3,34)
                               EqualsRange = None }),
                          { IsInstance = true
                            IsDispatchSlot = true
@@ -50,35 +50,35 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGetSet },
-                         /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,4--3,42),
+                         /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,4--3,42),
                          { GetSetKeywords =
                             Some
                               (GetSet
-                                 (/root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,35--3,38),
-                                  /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,39--3,42))) })],
-                     /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,4--3,42)),
+                                 (/root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,35--3,38),
+                                  /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,39--3,42))) })],
+                     /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (3,4--3,42)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
+                           /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                         None,
                         PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
+                        /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                         { AsKeyword = None })),
-                  /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,5--3,42),
+                  /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,5--3,42),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
+                       /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
+                       /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,0--3,42))],
+              /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,0--3,42))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,0--4,0),
+          /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs
rename to tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
rename to tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
index 793af8031b9..3023dd873d4 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs",
+     ("/root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs",
       false,
       QualifiedNameOfFile
         SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign, [], [],
@@ -13,7 +13,7 @@ ImplFile
                     ([], None, [], [Person],
                      PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,5--3,11)),
+                     /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,5--3,11)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
@@ -22,19 +22,19 @@ ImplFile
                            ([Typed
                                (Id
                                   (name, None, false, false, false,
-                                   /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,12--3,16)),
+                                   /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,12--3,16)),
                                 LongIdent (SynLongIdent ([string], [], [None])),
-                                /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,12--3,25));
+                                /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,12--3,25));
                              Typed
                                (Id
                                   (age, None, false, false, false,
-                                   /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,27--3,30)),
+                                   /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,27--3,30)),
                                 LongIdent (SynLongIdent ([int], [], [None])),
-                                /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,27--3,36))],
-                            /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,11--3,37)),
+                                /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,27--3,36))],
+                            /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,11--3,37)),
                          None,
                          PreXmlDoc ((3,11), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,5--3,11),
+                         /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,5--3,11),
                          { AsKeyword = None });
                       AutoProperty
                         ([], false, Name, None, PropertyGetSet,
@@ -52,23 +52,23 @@ ImplFile
                            MemberKind = PropertySet },
                          PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None, Ident name,
-                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,4--5,26),
+                         /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,4--5,26),
                          { LeadingKeyword =
                             MemberVal
-                              (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,4--5,10),
-                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,11--5,14))
+                              (/root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,4--5,10),
+                               /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,11--5,14))
                            WithKeyword =
                             Some
-                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,27--5,31)
+                              /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,27--5,31)
                            EqualsRange =
                             Some
-                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,20--5,21)
+                              /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,20--5,21)
                            GetSetKeywords =
                             Some
                               (GetSet
-                                 (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,32--5,35),
-                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,37--5,40))) })],
-                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,4--5,26)),
+                                 (/root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,32--5,35),
+                                  /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (5,37--5,40))) })],
+                     /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (4,4--5,26)),
                   [],
                   Some
                     (ImplicitCtor
@@ -77,31 +77,31 @@ ImplFile
                           ([Typed
                               (Id
                                  (name, None, false, false, false,
-                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,12--3,16)),
+                                  /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,12--3,16)),
                                LongIdent (SynLongIdent ([string], [], [None])),
-                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,12--3,25));
+                               /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,12--3,25));
                             Typed
                               (Id
                                  (age, None, false, false, false,
-                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,27--3,30)),
+                                  /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,27--3,30)),
                                LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,27--3,36))],
-                           /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,11--3,37)),
+                               /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,27--3,36))],
+                           /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,11--3,37)),
                         None,
                         PreXmlDoc ((3,11), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,5--3,11),
+                        /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,5--3,11),
                         { AsKeyword = None })),
-                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,0--5,26),
+                  /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,0--5,26),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,0--3,4)
+                       /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,0--3,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,38--3,39)
+                       /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,38--3,39)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,0--5,26))],
+              /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (2,0--5,26))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,0--6,0),
+          /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs
rename to tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
similarity index 59%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
index c9cddf92196..a88ef04cc78 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs",
+     ("/root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs",
       false,
       QualifiedNameOfFile
         SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword, [], [],
@@ -13,17 +13,17 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
+                     /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
+                            /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                          None,
                          PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
+                         /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                          { AsKeyword = None });
                       AutoProperty
                         ([], false, AutoProperty, None, PropertyGetSet,
@@ -41,22 +41,22 @@ ImplFile
                            MemberKind = PropertySet },
                          PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None, Ident autoProp,
-                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,4--3,38),
+                         /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,4--3,38),
                          { LeadingKeyword =
                             MemberVal
-                              (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,4--3,10),
-                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,11--3,14))
+                              (/root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,4--3,10),
+                               /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,11--3,14))
                            WithKeyword =
                             Some
-                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,39--3,43)
+                              /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,39--3,43)
                            EqualsRange =
                             Some
-                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,28--3,29)
+                              /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,28--3,29)
                            GetSetKeywords =
                             Some
                               (GetSet
-                                 (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,44--3,47),
-                                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,49--3,52))) });
+                                 (/root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,44--3,47),
+                                  /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,49--3,52))) });
                       AutoProperty
                         ([], false, AutoProperty2, None, Member,
                          { IsInstance = true
@@ -73,39 +73,39 @@ ImplFile
                            MemberKind = PropertySet },
                          PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None, Ident autoProp,
-                         /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (4,4--4,39),
+                         /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (4,4--4,39),
                          { LeadingKeyword =
                             MemberVal
-                              (/root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (4,4--4,10),
-                               /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (4,11--4,14))
+                              (/root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (4,4--4,10),
+                               /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (4,11--4,14))
                            WithKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (4,29--4,30)
+                              /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (4,29--4,30)
                            GetSetKeywords = None })],
-                     /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,4--4,39)),
+                     /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (3,4--4,39)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
+                           /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                         None,
                         PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
+                        /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                         { AsKeyword = None })),
-                  /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,5--4,39),
+                  /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,5--4,39),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
+                       /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
+                       /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,0--4,39))],
+              /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,0--4,39))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,0--5,0),
+          /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs
rename to tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
similarity index 60%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
rename to tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
index 62d07e195d9..bf0a38d0a1a 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeDefnWithMemberWithGetHasXmlComment.fs", false,
+     ("/root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs", false,
       QualifiedNameOfFile SynTypeDefnWithMemberWithGetHasXmlComment, [], [],
       [SynModuleOrNamespace
          ([SynTypeDefnWithMemberWithGetHasXmlComment], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [A],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,5--2,6)),
+                     /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [GetSetMember
@@ -33,52 +33,52 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([x; B],
-                                     [/root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,12--4,13)],
+                                     [/root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,12--4,13)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,23--4,25)),
-                                        /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,23--4,25))],
+                                           /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,23--4,25)),
+                                        /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,23--4,25))],
                                   None,
-                                  /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,20--4,25)),
+                                  /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,20--4,25)),
                                None,
                                Const
                                  (Int32 5,
-                                  /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,28--4,29)),
-                               /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,4--4,25),
+                                  /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,28--4,29)),
+                               /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,4--4,25),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,4--4,10)
+                                    /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,26--4,27) })),
+                                    /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,26--4,27) })),
                          None,
-                         /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,4--4,29),
+                         /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,4--4,29),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,15--4,19)
+                            /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,15--4,19)
                            GetKeyword =
                             Some
-                              /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,20--4,23)
+                              /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (4,20--4,23)
                            AndKeyword = None
                            SetKeyword = None })],
-                     /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,4--4,29)),
+                     /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (3,4--4,29)),
                   [], None,
-                  /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,5--4,29),
+                  /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,5--4,29),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,0--2,4)
+                       /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,7--2,8)
+                       /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,0--4,29))],
+              /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,0--4,29))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,0--5,0),
+          /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs
rename to tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl
similarity index 62%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs.bsl
rename to tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl
index 9999060b015..0adca5ba7bc 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithMemberWithSetget.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeDefnWithMemberWithSetget.fs", false,
+     ("/root/Member/SynTypeDefnWithMemberWithSetget.fs", false,
       QualifiedNameOfFile SynTypeDefnWithMemberWithSetget, [], [],
       [SynModuleOrNamespace
          ([SynTypeDefnWithMemberWithSetget], false, AnonModule,
@@ -10,17 +10,17 @@ ImplFile
                     ([], None, [], [A],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithMemberWithSetget.fs (2,5--2,6)),
+                     /root/Member/SynTypeDefnWithMemberWithSetget.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/SynTypeDefnWithMemberWithSetget.fs (2,6--2,8)),
+                            /root/Member/SynTypeDefnWithMemberWithSetget.fs (2,6--2,8)),
                          None,
                          PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynTypeDefnWithMemberWithSetget.fs (2,5--2,6),
+                         /root/Member/SynTypeDefnWithMemberWithSetget.fs (2,5--2,6),
                          { AsKeyword = None });
                       GetSetMember
                         (Some
@@ -42,40 +42,40 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; Z],
-                                     [/root/SynTypeDefnWithMemberWithSetget.fs (3,15--3,16)],
+                                     [/root/Member/SynTypeDefnWithMemberWithSetget.fs (3,15--3,16)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/SynTypeDefnWithMemberWithSetget.fs (3,52--3,54)),
-                                        /root/SynTypeDefnWithMemberWithSetget.fs (3,52--3,54))],
+                                           /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,52--3,54)),
+                                        /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,52--3,54))],
                                   None,
-                                  /root/SynTypeDefnWithMemberWithSetget.fs (3,49--3,54)),
+                                  /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,49--3,54)),
                                Some
                                  (SynBindingReturnInfo
                                     (LongIdent
                                        (SynLongIdent ([int], [], [None])),
-                                     /root/SynTypeDefnWithMemberWithSetget.fs (3,55--3,58),
+                                     /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,55--3,58),
                                      [],
                                      { ColonRange =
                                         Some
-                                          /root/SynTypeDefnWithMemberWithSetget.fs (3,54--3,55) })),
+                                          /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,54--3,55) })),
                                Typed
                                  (Const
                                     (Int32 1,
-                                     /root/SynTypeDefnWithMemberWithSetget.fs (3,61--3,62)),
+                                     /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,61--3,62)),
                                   LongIdent (SynLongIdent ([int], [], [None])),
-                                  /root/SynTypeDefnWithMemberWithSetget.fs (3,61--3,62)),
-                               /root/SynTypeDefnWithMemberWithSetget.fs (3,49--3,54),
+                                  /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,61--3,62)),
+                               /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,49--3,54),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/SynTypeDefnWithMemberWithSetget.fs (3,4--3,10)
+                                    /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,4--3,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/SynTypeDefnWithMemberWithSetget.fs (3,59--3,60) })),
+                                    /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,59--3,60) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false, [],
@@ -96,76 +96,79 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; Z],
-                                     [/root/SynTypeDefnWithMemberWithSetget.fs (3,15--3,16)],
+                                     [/root/Member/SynTypeDefnWithMemberWithSetget.fs (3,15--3,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Typed
                                           (Wild
-                                             /root/SynTypeDefnWithMemberWithSetget.fs (3,28--3,29),
+                                             /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,28--3,29),
                                            LongIdent
                                              (SynLongIdent ([int], [], [None])),
-                                           /root/SynTypeDefnWithMemberWithSetget.fs (3,28--3,33)),
-                                        /root/SynTypeDefnWithMemberWithSetget.fs (3,27--3,34))],
+                                           /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,28--3,33)),
+                                        /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,27--3,34))],
                                   None,
-                                  /root/SynTypeDefnWithMemberWithSetget.fs (3,23--3,34)),
+                                  /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,23--3,34)),
                                Some
                                  (SynBindingReturnInfo
                                     (LongIdent
                                        (SynLongIdent ([unit], [], [None])),
-                                     /root/SynTypeDefnWithMemberWithSetget.fs (3,35--3,39),
+                                     /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,35--3,39),
                                      [],
                                      { ColonRange =
                                         Some
-                                          /root/SynTypeDefnWithMemberWithSetget.fs (3,34--3,35) })),
+                                          /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,34--3,35) })),
                                Typed
                                  (Const
                                     (Unit,
-                                     /root/SynTypeDefnWithMemberWithSetget.fs (3,42--3,44)),
+                                     /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,42--3,44)),
                                   LongIdent (SynLongIdent ([unit], [], [None])),
-                                  /root/SynTypeDefnWithMemberWithSetget.fs (3,42--3,44)),
-                               /root/SynTypeDefnWithMemberWithSetget.fs (3,23--3,34),
+                                  /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,42--3,44)),
+                               /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,23--3,34),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/SynTypeDefnWithMemberWithSetget.fs (3,4--3,10)
+                                    /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,4--3,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/SynTypeDefnWithMemberWithSetget.fs (3,40--3,41) })),
-                         /root/SynTypeDefnWithMemberWithSetget.fs (3,4--3,62),
+                                    /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,40--3,41) })),
+                         /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,4--3,62),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/SynTypeDefnWithMemberWithSetget.fs (3,18--3,22)
+                            /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,18--3,22)
                            GetKeyword =
                             Some
-                              /root/SynTypeDefnWithMemberWithSetget.fs (3,49--3,52)
+                              /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,49--3,52)
                            AndKeyword =
                             Some
-                              /root/SynTypeDefnWithMemberWithSetget.fs (3,45--3,48)
+                              /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,45--3,48)
                            SetKeyword =
                             Some
-                              /root/SynTypeDefnWithMemberWithSetget.fs (3,23--3,26) })],
-                     /root/SynTypeDefnWithMemberWithSetget.fs (3,4--3,62)), [],
+                              /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,23--3,26) })],
+                     /root/Member/SynTypeDefnWithMemberWithSetget.fs (3,4--3,62)),
+                  [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/SynTypeDefnWithMemberWithSetget.fs (2,6--2,8)),
+                           /root/Member/SynTypeDefnWithMemberWithSetget.fs (2,6--2,8)),
                         None,
                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynTypeDefnWithMemberWithSetget.fs (2,5--2,6),
+                        /root/Member/SynTypeDefnWithMemberWithSetget.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/SynTypeDefnWithMemberWithSetget.fs (2,5--3,62),
+                  /root/Member/SynTypeDefnWithMemberWithSetget.fs (2,5--3,62),
                   { LeadingKeyword =
-                     Type /root/SynTypeDefnWithMemberWithSetget.fs (2,0--2,4)
+                     Type
+                       /root/Member/SynTypeDefnWithMemberWithSetget.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/SynTypeDefnWithMemberWithSetget.fs (2,9--2,10)
+                     Some
+                       /root/Member/SynTypeDefnWithMemberWithSetget.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithMemberWithSetget.fs (2,0--3,62))],
+              /root/Member/SynTypeDefnWithMemberWithSetget.fs (2,0--3,62))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithMemberWithSetget.fs (2,0--4,0),
+          /root/Member/SynTypeDefnWithMemberWithSetget.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs
rename to tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
similarity index 55%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
rename to tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
index bdeea7a54dc..5fbca71f9c4 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeDefnWithStaticMemberWithGetset.fs", false,
+     ("/root/Member/SynTypeDefnWithStaticMemberWithGetset.fs", false,
       QualifiedNameOfFile SynTypeDefnWithStaticMemberWithGetset, [], [],
       [SynModuleOrNamespace
          ([SynTypeDefnWithStaticMemberWithGetset], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,5--2,8)),
+                     /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [GetSetMember
@@ -36,10 +36,10 @@ ImplFile
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,17--5,19)),
-                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,17--5,19))],
+                                           /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,17--5,19)),
+                                        /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,17--5,19))],
                                   None,
-                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,13--5,19)),
+                                  /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,13--5,19)),
                                None,
                                Sequential
                                  (SuppressNeither, true,
@@ -51,32 +51,32 @@ ImplFile
                                            [Const
                                               (String
                                                  ("ReadWrite2", Regular,
-                                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,35--5,47)),
-                                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,35--5,47));
+                                                  /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,35--5,47)),
+                                               /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,35--5,47));
                                             Const
                                               (Int32 0,
-                                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,49--5,50))],
-                                           [/root/SynTypeDefnWithStaticMemberWithGetset.fs (5,47--5,48)],
-                                           /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,35--5,50)),
-                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,34--5,35),
+                                               /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,49--5,50))],
+                                           [/root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,47--5,48)],
+                                           /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,35--5,50)),
+                                        /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,34--5,35),
                                         Some
-                                          /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,50--5,51),
-                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,34--5,51)),
-                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,22--5,51)),
+                                          /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,50--5,51),
+                                        /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,34--5,51)),
+                                     /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,22--5,51)),
                                   Const
                                     (Int32 4,
-                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,53--5,54)),
-                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,22--5,54)),
-                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,13--5,19),
+                                     /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,53--5,54)),
+                                  /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,22--5,54)),
+                               /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,13--5,19),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   StaticMember
-                                    (/root/SynTypeDefnWithStaticMemberWithGetset.fs (3,4--3,10),
-                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,11--3,17))
+                                    (/root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (3,4--3,10),
+                                     /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (3,11--3,17))
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,20--5,21) })),
+                                    /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,20--5,21) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false, [],
@@ -99,9 +99,9 @@ ImplFile
                                   Pats
                                     [Named
                                        (SynIdent (x, None), false, None,
-                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,18--4,19))],
+                                        /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,18--4,19))],
                                   None,
-                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,19)),
+                                  /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,19)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([lastUsed], [], [None]),
@@ -111,52 +111,52 @@ ImplFile
                                         [Const
                                            (String
                                               ("ReadWrite2", Regular,
-                                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,47)),
-                                            /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,47));
+                                               /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,47)),
+                                            /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,47));
                                          Ident x],
-                                        [/root/SynTypeDefnWithStaticMemberWithGetset.fs (4,47--4,48)],
-                                        /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,50)),
-                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,34--4,35),
+                                        [/root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,47--4,48)],
+                                        /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,35--4,50)),
+                                     /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,34--4,35),
                                      Some
-                                       /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,50--4,51),
-                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,34--4,51)),
-                                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,22--4,51)),
-                               /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,19),
+                                       /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,50--4,51),
+                                     /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,34--4,51)),
+                                  /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,22--4,51)),
+                               /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,19),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   StaticMember
-                                    (/root/SynTypeDefnWithStaticMemberWithGetset.fs (3,4--3,10),
-                                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,11--3,17))
+                                    (/root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (3,4--3,10),
+                                     /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (3,11--3,17))
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,20--4,21) })),
-                         /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,4--5,54),
+                                    /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,20--4,21) })),
+                         /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (3,4--5,54),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,8--4,12)
+                            /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,8--4,12)
                            GetKeyword =
                             Some
-                              /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,13--5,16)
+                              /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,13--5,16)
                            AndKeyword =
                             Some
-                              /root/SynTypeDefnWithStaticMemberWithGetset.fs (5,8--5,11)
+                              /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (5,8--5,11)
                            SetKeyword =
                             Some
-                              /root/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,16) })],
-                     /root/SynTypeDefnWithStaticMemberWithGetset.fs (3,4--5,54)),
+                              /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (4,13--4,16) })],
+                     /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (3,4--5,54)),
                   [], None,
-                  /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,5--5,54),
+                  /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (2,5--5,54),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,0--2,4)
+                       /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,9--2,10)
+                       /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,0--5,54))],
+              /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (2,0--5,54))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithStaticMemberWithGetset.fs (2,0--6,0),
+          /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
rename to tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
similarity index 56%
rename from tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
index f0aa38ac498..ed3d3888635 100644
--- a/tests/service/data/SyntaxTree/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs",
+     ("/root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs",
       false,
       QualifiedNameOfFile
         Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword,
@@ -14,17 +14,17 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
+                     /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
+                            /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                          None,
                          PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
+                         /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                          { AsKeyword = None });
                       GetSetMember
                         (None,
@@ -48,65 +48,65 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyWriteOnlyProperty],
-                                     [/root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,15--4,16)],
+                                     [/root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,15--4,16)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Paren
                                        (Named
                                           (SynIdent (value, None), false, None,
-                                           /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,46--4,51)),
-                                        /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,45--4,52))],
+                                           /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,46--4,51)),
+                                        /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,45--4,52))],
                                   None,
-                                  /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,41--4,52)),
+                                  /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,41--4,52)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([myInternalValue], [], [None]),
                                   Ident value,
-                                  /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,55--4,79)),
-                               /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,41--4,52),
+                                  /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,55--4,79)),
+                               /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,41--4,52),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
+                                    /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,53--4,54) })),
-                         /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,79),
+                                    /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,53--4,54) })),
+                         /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,79),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,36--4,40)
+                            /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,36--4,40)
                            GetKeyword = None
                            AndKeyword = None
                            SetKeyword =
                             Some
-                              /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,41--4,44) })],
-                     /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,79)),
+                              /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,41--4,44) })],
+                     /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (4,4--4,79)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
+                           /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                         None,
                         PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
+                        /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                         { AsKeyword = None })),
-                  /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--4,79),
+                  /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,5--4,79),
                   { LeadingKeyword =
                      Type
-                       /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
+                       /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
+                       /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--4,79))],
+              /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--4,79))],
           PreXmlDocEmpty, [], None,
-          /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--5,0),
+          /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,29)] },
+            /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,29)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs b/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs
rename to tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs
diff --git a/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl
similarity index 60%
rename from tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs.bsl
rename to tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl
index 1efda36f007..575f25268e0 100644
--- a/tests/service/data/SyntaxTree/SynExprObjMembersHaveCorrectKeywords.fs.bsl
+++ b/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynExprObjMembersHaveCorrectKeywords.fs", false,
+     ("/root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs", false,
       QualifiedNameOfFile SynExprObjMembersHaveCorrectKeywords, [], [],
       [SynModuleOrNamespace
          ([SynExprObjMembersHaveCorrectKeywords], false, AnonModule,
@@ -13,12 +13,12 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (meh, None), false, None,
-                     /root/SynExprObjMembersHaveCorrectKeywords.fs (2,4--2,7)),
+                     /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (2,4--2,7)),
                   None,
                   ObjExpr
                     (LongIdent (SynLongIdent ([Interface], [], [None])), None,
                      Some
-                       /root/SynExprObjMembersHaveCorrectKeywords.fs (3,20--3,24),
+                       /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (3,20--3,24),
                      [],
                      [Member
                         (SynBinding
@@ -37,30 +37,30 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; Foo],
-                                  [/root/SynExprObjMembersHaveCorrectKeywords.fs (4,21--4,22)],
+                                  [/root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (4,21--4,22)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynExprObjMembersHaveCorrectKeywords.fs (4,26--4,28)),
-                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (4,26--4,28))],
+                                        /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (4,26--4,28)),
+                                     /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (4,26--4,28))],
                                None,
-                               /root/SynExprObjMembersHaveCorrectKeywords.fs (4,17--4,28)),
+                               /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (4,17--4,28)),
                             None,
                             Const
                               (Unit,
-                               /root/SynExprObjMembersHaveCorrectKeywords.fs (4,31--4,33)),
-                            /root/SynExprObjMembersHaveCorrectKeywords.fs (4,17--4,28),
+                               /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (4,31--4,33)),
+                            /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (4,17--4,28),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Override
-                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (4,8--4,16)
+                                 /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (4,8--4,16)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (4,29--4,30) }),
-                         /root/SynExprObjMembersHaveCorrectKeywords.fs (4,8--4,33));
+                                 /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (4,29--4,30) }),
+                         /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (4,8--4,33));
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
@@ -78,34 +78,34 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; Bar],
-                                  [/root/SynExprObjMembersHaveCorrectKeywords.fs (5,19--5,20)],
+                                  [/root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (5,19--5,20)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynExprObjMembersHaveCorrectKeywords.fs (5,24--5,26)),
-                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (5,24--5,26))],
+                                        /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (5,24--5,26)),
+                                     /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (5,24--5,26))],
                                None,
-                               /root/SynExprObjMembersHaveCorrectKeywords.fs (5,15--5,26)),
+                               /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (5,15--5,26)),
                             None,
                             Const
                               (Unit,
-                               /root/SynExprObjMembersHaveCorrectKeywords.fs (5,29--5,31)),
-                            /root/SynExprObjMembersHaveCorrectKeywords.fs (5,15--5,26),
+                               /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (5,29--5,31)),
+                            /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (5,15--5,26),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (5,8--5,14)
+                                 /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (5,8--5,14)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynExprObjMembersHaveCorrectKeywords.fs (5,27--5,28) }),
-                         /root/SynExprObjMembersHaveCorrectKeywords.fs (5,8--5,31))],
+                                 /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (5,27--5,28) }),
+                         /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (5,8--5,31))],
                      [SynInterfaceImpl
                         (LongIdent (SynLongIdent ([SomethingElse], [], [None])),
                          Some
-                           /root/SynExprObjMembersHaveCorrectKeywords.fs (6,30--6,34),
+                           /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (6,30--6,34),
                          [],
                          [Member
                             (SynBinding
@@ -125,45 +125,46 @@ ImplFile
                                 LongIdent
                                   (SynLongIdent
                                      ([this; Blah],
-                                      [/root/SynExprObjMembersHaveCorrectKeywords.fs (7,19--7,20)],
+                                      [/root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (7,19--7,20)],
                                       [None; None]), None, None,
                                    Pats
                                      [Paren
                                         (Const
                                            (Unit,
-                                            /root/SynExprObjMembersHaveCorrectKeywords.fs (7,25--7,27)),
-                                         /root/SynExprObjMembersHaveCorrectKeywords.fs (7,25--7,27))],
+                                            /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (7,25--7,27)),
+                                         /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (7,25--7,27))],
                                    None,
-                                   /root/SynExprObjMembersHaveCorrectKeywords.fs (7,15--7,27)),
+                                   /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (7,15--7,27)),
                                 None,
                                 Const
                                   (Unit,
-                                   /root/SynExprObjMembersHaveCorrectKeywords.fs (7,30--7,32)),
-                                /root/SynExprObjMembersHaveCorrectKeywords.fs (7,15--7,27),
+                                   /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (7,30--7,32)),
+                                /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (7,15--7,27),
                                 NoneAtInvisible,
                                 { LeadingKeyword =
                                    Member
-                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (7,8--7,14)
+                                     /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (7,8--7,14)
                                   InlineKeyword = None
                                   EqualsRange =
                                    Some
-                                     /root/SynExprObjMembersHaveCorrectKeywords.fs (7,28--7,29) }),
-                             /root/SynExprObjMembersHaveCorrectKeywords.fs (7,8--7,32))],
-                         /root/SynExprObjMembersHaveCorrectKeywords.fs (6,6--7,34))],
-                     /root/SynExprObjMembersHaveCorrectKeywords.fs (3,6--3,19),
-                     /root/SynExprObjMembersHaveCorrectKeywords.fs (3,4--7,34)),
-                  /root/SynExprObjMembersHaveCorrectKeywords.fs (2,4--2,7),
-                  Yes /root/SynExprObjMembersHaveCorrectKeywords.fs (2,0--7,34),
+                                     /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (7,28--7,29) }),
+                             /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (7,8--7,32))],
+                         /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (6,6--7,34))],
+                     /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (3,6--3,19),
+                     /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (3,4--7,34)),
+                  /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (2,4--2,7),
+                  Yes
+                    /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (2,0--7,34),
                   { LeadingKeyword =
                      Let
-                       /root/SynExprObjMembersHaveCorrectKeywords.fs (2,0--2,3)
+                       /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynExprObjMembersHaveCorrectKeywords.fs (2,8--2,9) })],
-              /root/SynExprObjMembersHaveCorrectKeywords.fs (2,0--7,34))],
+                       /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (2,8--2,9) })],
+              /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (2,0--7,34))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprObjMembersHaveCorrectKeywords.fs (2,0--8,0),
+          /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (2,0--8,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs
rename to tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
similarity index 67%
rename from tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
index 9ca37936744..04e5b2ca480 100644
--- a/tests/service/data/SyntaxTree/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs", false,
+     ("/root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs", false,
       QualifiedNameOfFile SynMemberDefnAbstractSlotHasCorrectKeyword, [], [],
       [SynModuleOrNamespace
          ([SynMemberDefnAbstractSlotHasCorrectKeyword], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,5--2,8)),
+                     /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [AbstractSlot
@@ -22,10 +22,10 @@ ImplFile
                             false,
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,20),
+                            /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,20),
                             { LeadingKeyword =
                                Abstract
-                                 /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,12)
+                                 /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,12)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -35,7 +35,7 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,20),
+                         /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--3,20),
                          { GetSetKeywords = None });
                       AbstractSlot
                         (SynValSig
@@ -46,11 +46,11 @@ ImplFile
                             false,
                             PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (4,4--4,26),
+                            /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (4,4--4,26),
                             { LeadingKeyword =
                                AbstractMember
-                                 (/root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (4,4--4,12),
-                                  /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (4,13--4,19))
+                                 (/root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (4,4--4,12),
+                                  /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (4,13--4,19))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -60,21 +60,21 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (4,4--4,26),
+                         /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (4,4--4,26),
                          { GetSetKeywords = None })],
-                     /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--4,26)),
+                     /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (3,4--4,26)),
                   [], None,
-                  /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,5--4,26),
+                  /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,5--4,26),
                   { LeadingKeyword =
                      Type
-                       /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,0--2,4)
+                       /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,9--2,10)
+                       /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,0--4,26))],
+              /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,0--4,26))],
           PreXmlDocEmpty, [], None,
-          /root/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,0--5,0),
+          /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs
rename to tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
similarity index 66%
rename from tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
index 7574d1890e5..3a0f4dd2001 100644
--- a/tests/service/data/SyntaxTree/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs", false,
+     ("/root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs", false,
       QualifiedNameOfFile SynMemberDefnAutoPropertyHasCorrectKeyword, [], [],
       [SynModuleOrNamespace
          ([SynMemberDefnAutoPropertyHasCorrectKeyword], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,5--2,8)),
+                     /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [AutoProperty
@@ -32,17 +32,17 @@ ImplFile
                          None,
                          Const
                            (Int32 1,
-                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,32--3,33)),
-                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,4--3,33),
+                            /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,32--3,33)),
+                         /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,4--3,33),
                          { LeadingKeyword =
                             StaticMemberVal
-                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,4--3,10),
-                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,11--3,17),
-                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,18--3,21))
+                              (/root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,4--3,10),
+                               /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,11--3,17),
+                               /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,18--3,21))
                            WithKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,30--3,31)
+                              /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,30--3,31)
                            GetSetKeywords = None });
                       AutoProperty
                         ([], false, X,
@@ -63,16 +63,16 @@ ImplFile
                          None,
                          Const
                            (Int32 1,
-                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,25--4,26)),
-                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,4--4,26),
+                            /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,25--4,26)),
+                         /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,4--4,26),
                          { LeadingKeyword =
                             MemberVal
-                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,4--4,10),
-                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,11--4,14))
+                              (/root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,4--4,10),
+                               /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,11--4,14))
                            WithKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,23--4,24)
+                              /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (4,23--4,24)
                            GetSetKeywords = None });
                       AutoProperty
                         ([], false, Y,
@@ -93,16 +93,16 @@ ImplFile
                          None,
                          Const
                            (Int32 2,
-                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,27--5,28)),
-                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,4--5,28),
+                            /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,27--5,28)),
+                         /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,4--5,28),
                          { LeadingKeyword =
                             OverrideVal
-                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,4--5,12),
-                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,13--5,16))
+                              (/root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,4--5,12),
+                               /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,13--5,16))
                            WithKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,25--5,26)
+                              /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (5,25--5,26)
                            GetSetKeywords = None });
                       AutoProperty
                         ([], false, Z,
@@ -123,30 +123,30 @@ ImplFile
                          None,
                          Const
                            (Int32 1,
-                            /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,26--6,27)),
-                         /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,4--6,27),
+                            /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,26--6,27)),
+                         /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,4--6,27),
                          { LeadingKeyword =
                             DefaultVal
-                              (/root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,4--6,11),
-                               /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,12--6,15))
+                              (/root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,4--6,11),
+                               /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,12--6,15))
                            WithKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,24--6,25)
+                              /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (6,24--6,25)
                            GetSetKeywords = None })],
-                     /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,4--6,27)),
+                     /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (3,4--6,27)),
                   [], None,
-                  /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,5--6,27),
+                  /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,5--6,27),
                   { LeadingKeyword =
                      Type
-                       /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,0--2,4)
+                       /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,9--2,10)
+                       /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,0--6,27))],
+              /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,0--6,27))],
           PreXmlDocEmpty, [], None,
-          /root/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,0--7,0),
+          /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs
rename to tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
similarity index 57%
rename from tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
index f45963a8eb2..c181ddd1a30 100644
--- a/tests/service/data/SyntaxTree/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
@@ -1,7 +1,8 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs", false,
-      QualifiedNameOfFile SynMemberDefnMemberSynValDataHasCorrectKeyword, [], [],
+     ("/root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs",
+      false, QualifiedNameOfFile SynMemberDefnMemberSynValDataHasCorrectKeyword,
+      [], [],
       [SynModuleOrNamespace
          ([SynMemberDefnMemberSynValDataHasCorrectKeyword], false, AnonModule,
           [Types
@@ -10,7 +11,7 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,5--2,8)),
+                     /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -29,31 +30,31 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; B],
-                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,22--3,23)],
+                                  [/root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,22--3,23)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,24--3,26)),
-                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,24--3,26))],
+                                        /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,24--3,26)),
+                                     /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,24--3,26))],
                                None,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,18--3,26)),
+                               /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,18--3,26)),
                             None,
                             Const
                               (Unit,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,29--3,31)),
-                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,18--3,26),
+                               /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,29--3,31)),
+                            /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,18--3,26),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                StaticMember
-                                 (/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,4--3,10),
-                                  /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,11--3,17))
+                                 (/root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,4--3,10),
+                                  /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,11--3,17))
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,27--3,28) }),
-                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,4--3,31));
+                                 /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,27--3,28) }),
+                         /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,4--3,31));
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
@@ -71,30 +72,30 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; A],
-                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,15--4,16)],
+                                  [/root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,15--4,16)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,17--4,19)),
-                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,17--4,19))],
+                                        /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,17--4,19)),
+                                     /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,17--4,19))],
                                None,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,11--4,19)),
+                               /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,11--4,19)),
                             None,
                             Const
                               (Unit,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,22--4,24)),
-                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,11--4,19),
+                               /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,22--4,24)),
+                            /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,11--4,19),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,4--4,10)
+                                 /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,4--4,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,20--4,21) }),
-                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,4--4,24));
+                                 /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,20--4,21) }),
+                         /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (4,4--4,24));
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
@@ -112,30 +113,30 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; C],
-                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,17--5,18)],
+                                  [/root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,17--5,18)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,19--5,21)),
-                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,19--5,21))],
+                                        /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,19--5,21)),
+                                     /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,19--5,21))],
                                None,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,13--5,21)),
+                               /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,13--5,21)),
                             None,
                             Const
                               (Unit,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,24--5,26)),
-                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,13--5,21),
+                               /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,24--5,26)),
+                            /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,13--5,21),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Override
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,4--5,12)
+                                 /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,4--5,12)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,22--5,23) }),
-                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,4--5,26));
+                                 /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,22--5,23) }),
+                         /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (5,4--5,26));
                       Member
                         (SynBinding
                            (None, Normal, false, false, [],
@@ -153,43 +154,43 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([this; D],
-                                  [/root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,16--6,17)],
+                                  [/root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,16--6,17)],
                                   [None; None]), None, None,
                                Pats
                                  [Paren
                                     (Const
                                        (Unit,
-                                        /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,18--6,20)),
-                                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,18--6,20))],
+                                        /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,18--6,20)),
+                                     /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,18--6,20))],
                                None,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,12--6,20)),
+                               /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,12--6,20)),
                             None,
                             Const
                               (Unit,
-                               /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,23--6,25)),
-                            /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,12--6,20),
+                               /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,23--6,25)),
+                            /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,12--6,20),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Default
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,4--6,11)
+                                 /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,4--6,11)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,21--6,22) }),
-                         /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,4--6,25))],
-                     /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,4--6,25)),
+                                 /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,21--6,22) }),
+                         /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (6,4--6,25))],
+                     /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (3,4--6,25)),
                   [], None,
-                  /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,5--6,25),
+                  /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,5--6,25),
                   { LeadingKeyword =
                      Type
-                       /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,0--2,4)
+                       /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,9--2,10)
+                       /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,0--6,25))],
+              /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,0--6,25))],
           PreXmlDocEmpty, [], None,
-          /root/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,0--7,0),
+          /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi b/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi
rename to tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi
diff --git a/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
similarity index 72%
rename from tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
rename to tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
index cc9b18c5e0d..90c4da77167 100644
--- a/tests/service/data/SyntaxTree/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
+++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/SynMemberSigMemberHasCorrectKeywords.fsi",
+     ("/root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi",
       QualifiedNameOfFile SynMemberSigMemberHasCorrectKeywords, [], [],
       [SynModuleOrNamespaceSig
          ([X], false, DeclaredNamespace,
@@ -10,7 +10,7 @@ SigFile
                     ([], None, [], [Y],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,5--4,6)),
+                     /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -22,10 +22,10 @@ SigFile
                             false,
                             PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,20),
+                            /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,20),
                             { LeadingKeyword =
                                Abstract
-                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,12)
+                                 /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,12)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -35,7 +35,7 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,20),
+                         /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--5,20),
                          { GetSetKeywords = None });
                       Member
                         (SynValSig
@@ -46,11 +46,11 @@ SigFile
                             false,
                             PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,30),
+                            /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,30),
                             { LeadingKeyword =
                                AbstractMember
-                                 (/root/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,12),
-                                  /root/SynMemberSigMemberHasCorrectKeywords.fsi (6,13--6,19))
+                                 (/root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,12),
+                                  /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (6,13--6,19))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -60,7 +60,7 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,30),
+                         /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (6,4--6,30),
                          { GetSetKeywords = None });
                       Member
                         (SynValSig
@@ -71,11 +71,11 @@ SigFile
                             false,
                             PreXmlDoc ((7,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,28),
+                            /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,28),
                             { LeadingKeyword =
                                StaticMember
-                                 (/root/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,10),
-                                  /root/SynMemberSigMemberHasCorrectKeywords.fsi (7,11--7,17))
+                                 (/root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,10),
+                                  /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (7,11--7,17))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -85,7 +85,7 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,28),
+                         /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (7,4--7,28),
                          { GetSetKeywords = None });
                       Member
                         (SynValSig
@@ -96,10 +96,10 @@ SigFile
                             false,
                             PreXmlDoc ((8,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,18),
+                            /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,18),
                             { LeadingKeyword =
                                Member
-                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,10)
+                                 /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,10)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -109,7 +109,7 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,18),
+                         /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (8,4--8,18),
                          { GetSetKeywords = None });
                       Member
                         (SynValSig
@@ -120,10 +120,10 @@ SigFile
                             false,
                             PreXmlDoc ((9,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,20),
+                            /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,20),
                             { LeadingKeyword =
                                Override
-                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,12)
+                                 /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,12)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -133,7 +133,7 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,20),
+                         /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (9,4--9,20),
                          { GetSetKeywords = None });
                       Member
                         (SynValSig
@@ -144,10 +144,10 @@ SigFile
                             false,
                             PreXmlDoc ((10,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynMemberSigMemberHasCorrectKeywords.fsi (10,4--10,19),
+                            /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (10,4--10,19),
                             { LeadingKeyword =
                                Default
-                                 /root/SynMemberSigMemberHasCorrectKeywords.fsi (10,4--10,11)
+                                 /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (10,4--10,11)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -157,22 +157,23 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/SynMemberSigMemberHasCorrectKeywords.fsi (10,4--10,19),
+                         /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (10,4--10,19),
                          { GetSetKeywords = None })],
-                     /root/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--10,19)),
+                     /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (5,4--10,19)),
                   [],
-                  /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,5--10,19),
+                  /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (4,5--10,19),
                   { LeadingKeyword =
                      Type
-                       /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,0--4,4)
+                       /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,7--4,8)
+                       /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/SynMemberSigMemberHasCorrectKeywords.fsi (4,0--10,19))],
+              /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (4,0--10,19))],
           PreXmlDocEmpty, [], None,
-          /root/SynMemberSigMemberHasCorrectKeywords.fsi (2,0--10,19),
+          /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (2,0--10,19),
           { LeadingKeyword =
-             Namespace /root/SynMemberSigMemberHasCorrectKeywords.fsi (2,0--2,9) })],
+             Namespace
+               /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberKeyword.fs.bsl
deleted file mode 100644
index 6ae13f27701..00000000000
--- a/tests/service/data/SyntaxTree/MemberKeyword.fs.bsl
+++ /dev/null
@@ -1,56 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/MemberKeyword.fs", false, QualifiedNameOfFile MemberKeyword, [], [],
-      [SynModuleOrNamespace
-         ([MemberKeyword], false, AnonModule,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [X],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/MemberKeyword.fs (2,5--2,6)),
-                  ObjectModel
-                    (Unspecified,
-                     [Member
-                        (SynBinding
-                           (None, Normal, false, false, [],
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            SynValData
-                              (Some { IsInstance = true
-                                      IsDispatchSlot = false
-                                      IsOverrideOrExplicitImpl = false
-                                      IsFinal = false
-                                      GetterOrSetterIsCompilerGenerated = false
-                                      MemberKind = Member },
-                               SynValInfo
-                                 ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None),
-                            LongIdent
-                              (SynLongIdent
-                                 ([this; Y],
-                                  [/root/MemberKeyword.fs (3,15--3,16)],
-                                  [None; None]), None, None,
-                               Pats
-                                 [Paren
-                                    (Const
-                                       (Unit,
-                                        /root/MemberKeyword.fs (3,18--3,20)),
-                                     /root/MemberKeyword.fs (3,18--3,20))], None,
-                               /root/MemberKeyword.fs (3,11--3,20)), None,
-                            Const (Unit, /root/MemberKeyword.fs (3,24--3,26)),
-                            /root/MemberKeyword.fs (3,11--3,20), NoneAtInvisible,
-                            { LeadingKeyword =
-                               Member /root/MemberKeyword.fs (3,4--3,10)
-                              InlineKeyword = None
-                              EqualsRange =
-                               Some /root/MemberKeyword.fs (3,22--3,23) }),
-                         /root/MemberKeyword.fs (3,4--3,26))],
-                     /root/MemberKeyword.fs (3,4--3,26)), [], None,
-                  /root/MemberKeyword.fs (2,5--3,26),
-                  { LeadingKeyword = Type /root/MemberKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/MemberKeyword.fs (2,7--2,8)
-                    WithKeyword = None })], /root/MemberKeyword.fs (2,0--3,26))],
-          PreXmlDocEmpty, [], None, /root/MemberKeyword.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs b/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs
rename to tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
new file mode 100644
index 00000000000..ba92f1e3181
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
@@ -0,0 +1,40 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs",
+      false,
+      QualifiedNameOfFile DeclaredNamespaceRangeShouldStartAtNamespaceKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([TypeEquality], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([],
+                     Some
+                       (PostfixList
+                          ([SynTyparDecl ([], SynTypar (a, None, false));
+                            SynTyparDecl ([], SynTypar (b, None, false))], [],
+                           /root/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,8--5,16))),
+                     [], [Teq],
+                     PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     true, None,
+                     /root/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,5--5,8)),
+                  Simple
+                    (None
+                       /root/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,5--5,8),
+                     /root/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,5--5,8)),
+                  [], None,
+                  /root/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,0--5,8),
+                  { LeadingKeyword =
+                     Type
+                       /root/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (5,0--5,4)
+                    EqualsRange = None
+                    WithKeyword = None })],
+              /root/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (4,0--5,8))],
+          PreXmlDocEmpty, [], None,
+          /root/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (2,0--5,8),
+          { LeadingKeyword =
+             Namespace
+               /root/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (2,0--2,9) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/GlobalInOpenPathShouldContainTrivia.fs
rename to tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl
new file mode 100644
index 00000000000..77e4fd6ca96
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl
@@ -0,0 +1,21 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs", false,
+      QualifiedNameOfFile GlobalInOpenPathShouldContainTrivia, [], [],
+      [SynModuleOrNamespace
+         ([Ionide; VSCode; FSharp], false, DeclaredNamespace,
+          [Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([`global`; Node],
+                    [/root/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs (4,11--4,12)],
+                    [Some (OriginalNotation "global"); None]),
+                 /root/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs (4,5--4,16)),
+              /root/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs (4,0--4,16))],
+          PreXmlDocEmpty, [], None,
+          /root/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs (2,0--4,16),
+          { LeadingKeyword =
+             Namespace
+               /root/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs (2,0--2,9) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fs
rename to tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
new file mode 100644
index 00000000000..93d2ed615d3
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
@@ -0,0 +1,42 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs",
+      false, QualifiedNameOfFile GlobalNamespaceShouldStartAtNamespaceKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([], false, GlobalNamespace,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((6,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,5--6,6)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok, LongIdent (SynLongIdent ([int], [], [None])),
+                        /root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,9--6,12)),
+                     /root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,9--6,12)),
+                  [], None,
+                  /root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,5--6,12),
+                  { LeadingKeyword =
+                     Type
+                       /root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,0--6,4)
+                    EqualsRange =
+                     Some
+                       /root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,7--6,8)
+                    WithKeyword = None })],
+              /root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (6,0--6,12))],
+          PreXmlDocEmpty, [], None,
+          /root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (4,0--6,12),
+          { LeadingKeyword =
+             Namespace
+               /root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (4,0--4,9) })],
+      (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (2,0--2,6);
+          LineComment
+            /root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (3,0--3,6)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs
rename to tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
new file mode 100644
index 00000000000..b49cc576c2d
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
@@ -0,0 +1,63 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs", false,
+      QualifiedNameOfFile Bar, [], [],
+      [SynModuleOrNamespace
+         ([Bar], false, NamedModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (s, None), false, None,
+                     /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (5,4--5,5)),
+                  Some
+                    (SynBindingReturnInfo
+                       (LongIdent (SynLongIdent ([string], [], [None])),
+                        /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (5,8--5,14),
+                        [],
+                        { ColonRange =
+                           Some
+                             /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (5,6--5,7) })),
+                  Typed
+                    (Const
+                       (String
+                          ("s", Regular,
+                           /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (5,17--5,20)),
+                        /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (5,17--5,20)),
+                     LongIdent (SynLongIdent ([string], [], [None])),
+                     /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (5,17--5,20)),
+                  /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (5,4--5,5),
+                  Yes
+                    /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (5,0--5,20),
+                  { LeadingKeyword =
+                     Let
+                       /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (5,0--5,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (5,15--5,16) })],
+              /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (5,0--5,20))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+          [{ Attributes =
+              [{ TypeName = SynLongIdent ([Foo], [], [None])
+                 ArgExpr =
+                  Const
+                    (Unit,
+                     /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (2,4--2,7))
+                 Target = None
+                 AppliesToGetterAndSetter = false
+                 Range =
+                  /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (2,4--2,7) }]
+             Range =
+              /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (2,0--2,11) }],
+          None,
+          /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (2,0--5,20),
+          { LeadingKeyword =
+             Module
+               /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (3,0--3,6) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs
rename to tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl
new file mode 100644
index 00000000000..a5e2eabe321
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl
@@ -0,0 +1,91 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs", false,
+      QualifiedNameOfFile FsAutoComplete.FCSPatches, [], [],
+      [SynModuleOrNamespace
+         ([FsAutoComplete; FCSPatches], false, NamedModule,
+          [Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([FSharp; Compiler; Syntax],
+                    [/root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (7,11--7,12);
+                     /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (7,20--7,21)],
+                    [None; None; None]),
+                 /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (7,5--7,27)),
+              /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (7,0--7,27));
+           Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([FSharp; Compiler; Text],
+                    [/root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (8,11--8,12);
+                     /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (8,20--8,21)],
+                    [None; None; None]),
+                 /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (8,5--8,25)),
+              /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (8,0--8,25));
+           Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([FsAutoComplete; UntypedAstUtils],
+                    [/root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (9,19--9,20)],
+                    [None; None]),
+                 /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (9,5--9,35)),
+              /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (9,0--9,35));
+           Open
+             (ModuleOrNamespace
+                (SynLongIdent
+                   ([FSharp; Compiler; CodeAnalysis],
+                    [/root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (10,11--10,12);
+                     /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (10,20--10,21)],
+                    [None; None; None]),
+                 /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (10,5--10,33)),
+              /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (10,0--10,33));
+           NestedModule
+             (SynComponentInfo
+                ([], None, [], [SynExprAppLocationsImpl],
+                 PreXmlDoc ((12,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 Some
+                   (Internal
+                      /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (12,7--12,15)),
+                 /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (12,0--12,39)),
+              false,
+              [Let
+                 (false,
+                  [SynBinding
+                     (None, Normal, false, false, [],
+                      PreXmlDoc ((13,0), FSharp.Compiler.Xml.XmlDocCollector),
+                      SynValData
+                        (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                         None),
+                      Named
+                        (SynIdent (a, None), false, None,
+                         /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (13,4--13,5)),
+                      None,
+                      Const
+                        (Int32 42,
+                         /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (13,8--13,10)),
+                      /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (13,4--13,5),
+                      Yes
+                        /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (13,0--13,10),
+                      { LeadingKeyword =
+                         Let
+                           /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (13,0--13,3)
+                        InlineKeyword = None
+                        EqualsRange =
+                         Some
+                           /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (13,6--13,7) })],
+                  /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (13,0--13,10))],
+              false,
+              /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (12,0--13,10),
+              { ModuleKeyword =
+                 Some
+                   /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (12,0--12,6)
+                EqualsRange =
+                 Some
+                   /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (12,40--12,41) })],
+          PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (2,0--13,10),
+          { LeadingKeyword =
+             Module
+               /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (5,0--5,6) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs b/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs
rename to tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
new file mode 100644
index 00000000000..7d55f48443b
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
@@ -0,0 +1,68 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs",
+      false,
+      QualifiedNameOfFile
+        MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([TypeEquality], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Teq],
+                     PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (5,5--5,8)),
+                  ObjectModel
+                    (Class, [],
+                     /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (5,11--5,20)),
+                  [], None,
+                  /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,0--5,20),
+                  { LeadingKeyword =
+                     Type
+                       /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (5,0--5,4)
+                    EqualsRange =
+                     Some
+                       /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (5,9--5,10)
+                    WithKeyword = None })],
+              /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,0--5,20))],
+          PreXmlDocEmpty, [], None,
+          /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (2,0--5,20),
+          { LeadingKeyword =
+             Namespace
+               /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (2,0--2,9) });
+       SynModuleOrNamespace
+         ([Foobar], false, DeclaredNamespace,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((9,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent (x, None), false, None,
+                     /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,4--9,5)),
+                  None,
+                  Const
+                    (Int32 42,
+                     /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,8--9,10)),
+                  /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,4--9,5),
+                  Yes
+                    /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,0--9,10),
+                  { LeadingKeyword =
+                     Let
+                       /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,0--9,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,6--9,7) })],
+              /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,0--9,10))],
+          PreXmlDocEmpty, [], None,
+          /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (7,0--9,10),
+          { LeadingKeyword =
+             Namespace
+               /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (7,0--7,9) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs b/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs
rename to tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl
new file mode 100644
index 00000000000..d75315182aa
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl
@@ -0,0 +1,54 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs", false,
+      QualifiedNameOfFile NamespaceShouldContainNamespaceKeyword, [], [],
+      [SynModuleOrNamespace
+         ([Foo], false, DeclaredNamespace,
+          [NestedModule
+             (SynComponentInfo
+                ([], None, [], [Bar],
+                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 None,
+                 /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (3,0--3,10)),
+              false,
+              [Let
+                 (false,
+                  [SynBinding
+                     (None, Normal, false, false, [],
+                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                      SynValData
+                        (None, SynValInfo ([], SynArgInfo ([], false, None)),
+                         None),
+                      Named
+                        (SynIdent (a, None), false, None,
+                         /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (4,4--4,5)),
+                      None,
+                      Const
+                        (Int32 42,
+                         /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (4,8--4,10)),
+                      /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (4,4--4,5),
+                      Yes
+                        /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (4,0--4,10),
+                      { LeadingKeyword =
+                         Let
+                           /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (4,0--4,3)
+                        InlineKeyword = None
+                        EqualsRange =
+                         Some
+                           /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (4,6--4,7) })],
+                  /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (4,0--4,10))],
+              false,
+              /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (3,0--4,10),
+              { ModuleKeyword =
+                 Some
+                   /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (3,0--3,6)
+                EqualsRange =
+                 Some
+                   /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (3,11--3,12) })],
+          PreXmlDocEmpty, [], None,
+          /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (2,0--4,10),
+          { LeadingKeyword =
+             Namespace
+               /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (2,0--2,9) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi
rename to tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi
diff --git a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
rename to tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
index 8ebc1b89201..4e375ab34f8 100644
--- a/tests/service/data/SyntaxTree/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi",
+     ("/root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi",
       QualifiedNameOfFile GlobalNamespaceShouldStartAtNamespaceKeyword, [], [],
       [SynModuleOrNamespaceSig
          ([], false, GlobalNamespace,
@@ -10,7 +10,7 @@ SigFile
                     ([], None, [], [Bar],
                      PreXmlDoc ((6,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,5--6,8)),
+                     /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,5--6,8)),
                   Simple
                     (Union
                        (None,
@@ -23,7 +23,7 @@ SigFile
                                     (SynLongIdent ([string], [], [None])), false,
                                   PreXmlDoc ((6,20), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,20--6,26),
+                                  /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,20--6,26),
                                   { LeadingKeyword = None });
                                SynField
                                  ([], false, None,
@@ -31,35 +31,35 @@ SigFile
                                   false,
                                   PreXmlDoc ((6,29), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,29--6,32),
+                                  /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,29--6,32),
                                   { LeadingKeyword = None })],
                             PreXmlDoc ((6,11), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,13--6,32),
+                            /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,13--6,32),
                             { BarRange =
                                Some
-                                 /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,11--6,12) })],
-                        /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,11--6,32)),
-                     /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,11--6,32)),
+                                 /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,11--6,12) })],
+                        /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,11--6,32)),
+                     /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,11--6,32)),
                   [],
-                  /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,5--6,32),
+                  /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,5--6,32),
                   { LeadingKeyword =
                      Type
-                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,0--6,4)
+                       /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,0--6,4)
                     EqualsRange =
                      Some
-                       /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,9--6,10)
+                       /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,9--6,10)
                     WithKeyword = None })],
-              /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,0--6,32))],
+              /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (6,0--6,32))],
           PreXmlDocEmpty, [], None,
-          /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (4,0--6,32),
+          /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (4,0--6,32),
           { LeadingKeyword =
              Namespace
-               /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (4,0--4,9) })],
+               /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (4,0--4,9) })],
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (2,0--2,6);
+            /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (2,0--2,6);
           LineComment
-            /root/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (3,0--3,6)] },
+            /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (3,0--3,6)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi
rename to tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi
diff --git a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
similarity index 55%
rename from tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
rename to tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
index a3031ffccb7..0c3a5a471e9 100644
--- a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/ModuleRangeShouldStartAtFirstAttribute.fsi",
+     ("/root/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi",
       QualifiedNameOfFile Bar, [], [],
       [SynModuleOrNamespaceSig
          ([Bar], false, NamedModule,
@@ -11,29 +11,31 @@ SigFile
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
                  PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector), None,
                  None,
-                 /root/ModuleRangeShouldStartAtFirstAttribute.fsi (5,0--5,14),
+                 /root/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi (5,0--5,14),
                  { LeadingKeyword =
                     Val
-                      /root/ModuleRangeShouldStartAtFirstAttribute.fsi (5,0--5,3)
+                      /root/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi (5,0--5,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/ModuleRangeShouldStartAtFirstAttribute.fsi (5,0--5,14))],
+              /root/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi (5,0--5,14))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
           [{ Attributes =
               [{ TypeName = SynLongIdent ([Foo], [], [None])
                  ArgExpr =
                   Const
                     (Unit,
-                     /root/ModuleRangeShouldStartAtFirstAttribute.fsi (2,4--2,7))
+                     /root/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi (2,4--2,7))
                  Target = None
                  AppliesToGetterAndSetter = false
                  Range =
-                  /root/ModuleRangeShouldStartAtFirstAttribute.fsi (2,4--2,7) }]
+                  /root/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi (2,4--2,7) }]
              Range =
-              /root/ModuleRangeShouldStartAtFirstAttribute.fsi (2,0--2,11) }],
-          None, /root/ModuleRangeShouldStartAtFirstAttribute.fsi (2,0--5,14),
+              /root/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi (2,0--2,11) }],
+          None,
+          /root/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi (2,0--5,14),
           { LeadingKeyword =
-             Module /root/ModuleRangeShouldStartAtFirstAttribute.fsi (3,0--3,6) })],
+             Module
+               /root/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi (3,0--3,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi
rename to tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi
diff --git a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi.bsl
rename to tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl
index d42fb78d1db..b7d19858833 100644
--- a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl
@@ -1,7 +1,7 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/ModuleShouldContainModuleKeyword.fsi", QualifiedNameOfFile Bar, [],
-      [],
+     ("/root/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi",
+      QualifiedNameOfFile Bar, [], [],
       [SynModuleOrNamespaceSig
          ([Bar], false, NamedModule,
           [Val
@@ -10,16 +10,19 @@ SigFile
                  LongIdent (SynLongIdent ([int], [], [None])),
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
                  PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 None, /root/ModuleShouldContainModuleKeyword.fsi (4,0--4,10),
+                 None,
+                 /root/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi (4,0--4,10),
                  { LeadingKeyword =
-                    Val /root/ModuleShouldContainModuleKeyword.fsi (4,0--4,3)
+                    Val
+                      /root/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi (4,0--4,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/ModuleShouldContainModuleKeyword.fsi (4,0--4,10))],
+              /root/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi (4,0--4,10))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/ModuleShouldContainModuleKeyword.fsi (2,0--4,10),
+          /root/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi (2,0--4,10),
           { LeadingKeyword =
-             Module /root/ModuleShouldContainModuleKeyword.fsi (2,0--2,6) })],
+             Module
+               /root/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi
rename to tests/service/data/SyntaxTree/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi
diff --git a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi.bsl
similarity index 55%
rename from tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi.bsl
rename to tests/service/data/SyntaxTree/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi.bsl
index ab88d84a929..8bd922ef96d 100644
--- a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/NamespaceShouldContainNamespaceKeyword.fsi",
+     ("/root/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi",
       QualifiedNameOfFile NamespaceShouldContainNamespaceKeyword, [], [],
       [SynModuleOrNamespaceSig
          ([Foo], false, DeclaredNamespace,
@@ -9,7 +9,7 @@ SigFile
                 ([], None, [], [Bar],
                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/NamespaceShouldContainNamespaceKeyword.fsi (3,0--3,10)),
+                 /root/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi (3,0--3,10)),
               false,
               [Val
                  (SynValSig
@@ -18,25 +18,25 @@ SigFile
                      SynValInfo ([], SynArgInfo ([], false, None)), false, false,
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      None, None,
-                     /root/NamespaceShouldContainNamespaceKeyword.fsi (4,0--4,10),
+                     /root/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi (4,0--4,10),
                      { LeadingKeyword =
                         Val
-                          /root/NamespaceShouldContainNamespaceKeyword.fsi (4,0--4,3)
+                          /root/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi (4,0--4,3)
                        InlineKeyword = None
                        WithKeyword = None
                        EqualsRange = None }),
-                  /root/NamespaceShouldContainNamespaceKeyword.fsi (4,0--4,10))],
-              /root/NamespaceShouldContainNamespaceKeyword.fsi (3,0--4,10),
+                  /root/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi (4,0--4,10))],
+              /root/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi (3,0--4,10),
               { ModuleKeyword =
                  Some
-                   /root/NamespaceShouldContainNamespaceKeyword.fsi (3,0--3,6)
+                   /root/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi (3,0--3,6)
                 EqualsRange =
                  Some
-                   /root/NamespaceShouldContainNamespaceKeyword.fsi (3,11--3,12) })],
+                   /root/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi (3,11--3,12) })],
           PreXmlDocEmpty, [], None,
-          /root/NamespaceShouldContainNamespaceKeyword.fsi (2,0--4,10),
+          /root/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi (2,0--4,10),
           { LeadingKeyword =
              Namespace
-               /root/NamespaceShouldContainNamespaceKeyword.fsi (2,0--2,9) })],
+               /root/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi
rename to tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi
diff --git a/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
similarity index 55%
rename from tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
rename to tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
index bcd11114de2..2b4a9952f78 100644
--- a/tests/service/data/SyntaxTree/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi",
+     ("/root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi",
       QualifiedNameOfFile RangeMemberReturnsRangeOfSynModuleOrNamespaceSig, [],
       [],
       [SynModuleOrNamespaceSig
@@ -11,7 +11,7 @@ SigFile
                     ([], None, [], [Bar],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,5--4,8)),
+                     /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,5--4,8)),
                   Simple
                     (Union
                        (None,
@@ -24,7 +24,7 @@ SigFile
                                     (SynLongIdent ([string], [], [None])), false,
                                   PreXmlDoc ((4,20), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,20--4,26),
+                                  /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,20--4,26),
                                   { LeadingKeyword = None });
                                SynField
                                  ([], false, None,
@@ -32,30 +32,30 @@ SigFile
                                   false,
                                   PreXmlDoc ((4,29), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,29--4,32),
+                                  /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,29--4,32),
                                   { LeadingKeyword = None })],
                             PreXmlDoc ((4,11), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,13--4,32),
+                            /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,13--4,32),
                             { BarRange =
                                Some
-                                 /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,11--4,12) })],
-                        /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,11--4,32)),
-                     /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,11--4,32)),
+                                 /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,11--4,12) })],
+                        /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,11--4,32)),
+                     /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,11--4,32)),
                   [],
-                  /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,5--4,32),
+                  /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,5--4,32),
                   { LeadingKeyword =
                      Type
-                       /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,0--4,4)
+                       /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,9--4,10)
+                       /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,9--4,10)
                     WithKeyword = None })],
-              /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,0--4,32))],
+              /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (4,0--4,32))],
           PreXmlDocEmpty, [], None,
-          /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (2,0--4,32),
+          /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (2,0--4,32),
           { LeadingKeyword =
              Namespace
-               /root/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (2,0--2,9) })],
+               /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs.bsl b/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
deleted file mode 100644
index ca29cbf2052..00000000000
--- a/tests/service/data/SyntaxTree/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
+++ /dev/null
@@ -1,60 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/ModuleRangeShouldStartAtFirstAttribute.fs", false,
-      QualifiedNameOfFile Bar, [], [],
-      [SynModuleOrNamespace
-         ([Bar], false, NamedModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (s, None), false, None,
-                     /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,4--5,5)),
-                  Some
-                    (SynBindingReturnInfo
-                       (LongIdent (SynLongIdent ([string], [], [None])),
-                        /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,8--5,14),
-                        [],
-                        { ColonRange =
-                           Some
-                             /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,6--5,7) })),
-                  Typed
-                    (Const
-                       (String
-                          ("s", Regular,
-                           /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,17--5,20)),
-                        /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,17--5,20)),
-                     LongIdent (SynLongIdent ([string], [], [None])),
-                     /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,17--5,20)),
-                  /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,4--5,5),
-                  Yes
-                    /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,0--5,20),
-                  { LeadingKeyword =
-                     Let
-                       /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,0--5,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some
-                       /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,15--5,16) })],
-              /root/ModuleRangeShouldStartAtFirstAttribute.fs (5,0--5,20))],
-          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-          [{ Attributes =
-              [{ TypeName = SynLongIdent ([Foo], [], [None])
-                 ArgExpr =
-                  Const
-                    (Unit,
-                     /root/ModuleRangeShouldStartAtFirstAttribute.fs (2,4--2,7))
-                 Target = None
-                 AppliesToGetterAndSetter = false
-                 Range =
-                  /root/ModuleRangeShouldStartAtFirstAttribute.fs (2,4--2,7) }]
-             Range = /root/ModuleRangeShouldStartAtFirstAttribute.fs (2,0--2,11) }],
-          None, /root/ModuleRangeShouldStartAtFirstAttribute.fs (2,0--5,20),
-          { LeadingKeyword =
-             Module /root/ModuleRangeShouldStartAtFirstAttribute.fs (3,0--3,6) })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs.bsl
deleted file mode 100644
index 4b950b54884..00000000000
--- a/tests/service/data/SyntaxTree/ModuleShouldContainModuleKeyword.fs.bsl
+++ /dev/null
@@ -1,86 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/ModuleShouldContainModuleKeyword.fs", false,
-      QualifiedNameOfFile FsAutoComplete.FCSPatches, [], [],
-      [SynModuleOrNamespace
-         ([FsAutoComplete; FCSPatches], false, NamedModule,
-          [Open
-             (ModuleOrNamespace
-                (SynLongIdent
-                   ([FSharp; Compiler; Syntax],
-                    [/root/ModuleShouldContainModuleKeyword.fs (7,11--7,12);
-                     /root/ModuleShouldContainModuleKeyword.fs (7,20--7,21)],
-                    [None; None; None]),
-                 /root/ModuleShouldContainModuleKeyword.fs (7,5--7,27)),
-              /root/ModuleShouldContainModuleKeyword.fs (7,0--7,27));
-           Open
-             (ModuleOrNamespace
-                (SynLongIdent
-                   ([FSharp; Compiler; Text],
-                    [/root/ModuleShouldContainModuleKeyword.fs (8,11--8,12);
-                     /root/ModuleShouldContainModuleKeyword.fs (8,20--8,21)],
-                    [None; None; None]),
-                 /root/ModuleShouldContainModuleKeyword.fs (8,5--8,25)),
-              /root/ModuleShouldContainModuleKeyword.fs (8,0--8,25));
-           Open
-             (ModuleOrNamespace
-                (SynLongIdent
-                   ([FsAutoComplete; UntypedAstUtils],
-                    [/root/ModuleShouldContainModuleKeyword.fs (9,19--9,20)],
-                    [None; None]),
-                 /root/ModuleShouldContainModuleKeyword.fs (9,5--9,35)),
-              /root/ModuleShouldContainModuleKeyword.fs (9,0--9,35));
-           Open
-             (ModuleOrNamespace
-                (SynLongIdent
-                   ([FSharp; Compiler; CodeAnalysis],
-                    [/root/ModuleShouldContainModuleKeyword.fs (10,11--10,12);
-                     /root/ModuleShouldContainModuleKeyword.fs (10,20--10,21)],
-                    [None; None; None]),
-                 /root/ModuleShouldContainModuleKeyword.fs (10,5--10,33)),
-              /root/ModuleShouldContainModuleKeyword.fs (10,0--10,33));
-           NestedModule
-             (SynComponentInfo
-                ([], None, [], [SynExprAppLocationsImpl],
-                 PreXmlDoc ((12,0), FSharp.Compiler.Xml.XmlDocCollector), false,
-                 Some
-                   (Internal
-                      /root/ModuleShouldContainModuleKeyword.fs (12,7--12,15)),
-                 /root/ModuleShouldContainModuleKeyword.fs (12,0--12,39)), false,
-              [Let
-                 (false,
-                  [SynBinding
-                     (None, Normal, false, false, [],
-                      PreXmlDoc ((13,0), FSharp.Compiler.Xml.XmlDocCollector),
-                      SynValData
-                        (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                         None),
-                      Named
-                        (SynIdent (a, None), false, None,
-                         /root/ModuleShouldContainModuleKeyword.fs (13,4--13,5)),
-                      None,
-                      Const
-                        (Int32 42,
-                         /root/ModuleShouldContainModuleKeyword.fs (13,8--13,10)),
-                      /root/ModuleShouldContainModuleKeyword.fs (13,4--13,5),
-                      Yes
-                        /root/ModuleShouldContainModuleKeyword.fs (13,0--13,10),
-                      { LeadingKeyword =
-                         Let
-                           /root/ModuleShouldContainModuleKeyword.fs (13,0--13,3)
-                        InlineKeyword = None
-                        EqualsRange =
-                         Some
-                           /root/ModuleShouldContainModuleKeyword.fs (13,6--13,7) })],
-                  /root/ModuleShouldContainModuleKeyword.fs (13,0--13,10))],
-              false, /root/ModuleShouldContainModuleKeyword.fs (12,0--13,10),
-              { ModuleKeyword =
-                 Some /root/ModuleShouldContainModuleKeyword.fs (12,0--12,6)
-                EqualsRange =
-                 Some /root/ModuleShouldContainModuleKeyword.fs (12,40--12,41) })],
-          PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/ModuleShouldContainModuleKeyword.fs (2,0--13,10),
-          { LeadingKeyword =
-             Module /root/ModuleShouldContainModuleKeyword.fs (5,0--5,6) })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
deleted file mode 100644
index cab794fa21a..00000000000
--- a/tests/service/data/SyntaxTree/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
+++ /dev/null
@@ -1,68 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs",
-      false,
-      QualifiedNameOfFile
-        MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword,
-      [], [],
-      [SynModuleOrNamespace
-         ([TypeEquality], false, DeclaredNamespace,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [Teq],
-                     PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (5,5--5,8)),
-                  ObjectModel
-                    (Class, [],
-                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (5,11--5,20)),
-                  [], None,
-                  /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,0--5,20),
-                  { LeadingKeyword =
-                     Type
-                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (5,0--5,4)
-                    EqualsRange =
-                     Some
-                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (5,9--5,10)
-                    WithKeyword = None })],
-              /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (4,0--5,20))],
-          PreXmlDocEmpty, [], None,
-          /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (2,0--5,20),
-          { LeadingKeyword =
-             Namespace
-               /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (2,0--2,9) });
-       SynModuleOrNamespace
-         ([Foobar], false, DeclaredNamespace,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((9,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (x, None), false, None,
-                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,4--9,5)),
-                  None,
-                  Const
-                    (Int32 42,
-                     /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,8--9,10)),
-                  /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,4--9,5),
-                  Yes
-                    /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,0--9,10),
-                  { LeadingKeyword =
-                     Let
-                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,0--9,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some
-                       /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,6--9,7) })],
-              /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (9,0--9,10))],
-          PreXmlDocEmpty, [], None,
-          /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (7,0--9,10),
-          { LeadingKeyword =
-             Namespace
-               /root/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (7,0--7,9) })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl b/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
deleted file mode 100644
index 08e5a8d839d..00000000000
--- a/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
+++ /dev/null
@@ -1,56 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/MultipleSynEnumCaseContainsRangeOfConstant.fs", false,
-      QualifiedNameOfFile MultipleSynEnumCaseContainsRangeOfConstant, [], [],
-      [SynModuleOrNamespace
-         ([MultipleSynEnumCaseContainsRangeOfConstant], false, AnonModule,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [Foo],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,5--2,8)),
-                  Simple
-                    (Enum
-                       ([SynEnumCase
-                           ([], SynIdent (One, None),
-                            Const
-                              (Int32 1,
-                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,13--3,23)),
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,6--3,23),
-                            { BarRange =
-                               Some
-                                 /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,4--3,5)
-                              EqualsRange =
-                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,10--3,11) });
-                         SynEnumCase
-                           ([], SynIdent (Two, None),
-                            Const
-                              (Int32 2,
-                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (4,12--4,13)),
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (4,6--4,13),
-                            { BarRange =
-                               Some
-                                 /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (4,4--4,5)
-                              EqualsRange =
-                               /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (4,10--4,11) })],
-                        /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,4--4,13)),
-                     /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,4--4,13)),
-                  [], None,
-                  /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,5--4,13),
-                  { LeadingKeyword =
-                     Type
-                       /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,0--2,4)
-                    EqualsRange =
-                     Some
-                       /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,9--2,10)
-                    WithKeyword = None })],
-              /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,0--4,13))],
-          PreXmlDocEmpty, [], None,
-          /root/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,0--5,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs.bsl b/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs.bsl
deleted file mode 100644
index cad8f027b80..00000000000
--- a/tests/service/data/SyntaxTree/MultipleSynEnumCasesHaveBarRange.fs.bsl
+++ /dev/null
@@ -1,53 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/MultipleSynEnumCasesHaveBarRange.fs", false,
-      QualifiedNameOfFile MultipleSynEnumCasesHaveBarRange, [], [],
-      [SynModuleOrNamespace
-         ([MultipleSynEnumCasesHaveBarRange], false, AnonModule,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [Foo],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/MultipleSynEnumCasesHaveBarRange.fs (2,5--2,8)),
-                  Simple
-                    (Enum
-                       ([SynEnumCase
-                           ([], SynIdent (Bar, None),
-                            Const
-                              (Int32 1,
-                               /root/MultipleSynEnumCasesHaveBarRange.fs (3,12--3,13)),
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/MultipleSynEnumCasesHaveBarRange.fs (3,6--3,13),
-                            { BarRange =
-                               Some
-                                 /root/MultipleSynEnumCasesHaveBarRange.fs (3,4--3,5)
-                              EqualsRange =
-                               /root/MultipleSynEnumCasesHaveBarRange.fs (3,10--3,11) });
-                         SynEnumCase
-                           ([], SynIdent (Bear, None),
-                            Const
-                              (Int32 2,
-                               /root/MultipleSynEnumCasesHaveBarRange.fs (4,13--4,14)),
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/MultipleSynEnumCasesHaveBarRange.fs (4,6--4,14),
-                            { BarRange =
-                               Some
-                                 /root/MultipleSynEnumCasesHaveBarRange.fs (4,4--4,5)
-                              EqualsRange =
-                               /root/MultipleSynEnumCasesHaveBarRange.fs (4,11--4,12) })],
-                        /root/MultipleSynEnumCasesHaveBarRange.fs (3,4--4,14)),
-                     /root/MultipleSynEnumCasesHaveBarRange.fs (3,4--4,14)), [],
-                  None, /root/MultipleSynEnumCasesHaveBarRange.fs (2,5--4,14),
-                  { LeadingKeyword =
-                     Type /root/MultipleSynEnumCasesHaveBarRange.fs (2,0--2,4)
-                    EqualsRange =
-                     Some /root/MultipleSynEnumCasesHaveBarRange.fs (2,9--2,10)
-                    WithKeyword = None })],
-              /root/MultipleSynEnumCasesHaveBarRange.fs (2,0--4,14))],
-          PreXmlDocEmpty, [], None,
-          /root/MultipleSynEnumCasesHaveBarRange.fs (2,0--5,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs.bsl
deleted file mode 100644
index e67ad8c092d..00000000000
--- a/tests/service/data/SyntaxTree/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs.bsl
+++ /dev/null
@@ -1,79 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs",
-      false,
-      QualifiedNameOfFile
-        MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression,
-      [], [],
-      [SynModuleOrNamespace
-         ([MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression],
-          false, AnonModule,
-          [Expr
-             (App
-                (NonAtomic, false, Ident async,
-                 ComputationExpr
-                   (false,
-                    LetOrUseBang
-                      (Yes
-                         /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,4--3,24),
-                       false, true,
-                       Named
-                         (SynIdent (bar, None), false, None,
-                          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,9--3,12)),
-                       App
-                         (NonAtomic, false, Ident getBar,
-                          Const
-                            (Unit,
-                             /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,22--3,24)),
-                          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,15--3,24)),
-                       [SynExprAndBang
-                          (Yes
-                             /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,4--4,27),
-                           false, true,
-                           Named
-                             (SynIdent (foo, None), false, None,
-                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,9--4,12)),
-                           App
-                             (NonAtomic, false, Ident getFoo,
-                              Const
-                                (Unit,
-                                 /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,22--4,24)),
-                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,15--4,24)),
-                           /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,4--4,24),
-                           { EqualsRange =
-                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,13--4,14)
-                             InKeyword =
-                              Some
-                                /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (4,25--4,27) });
-                        SynExprAndBang
-                          (Yes
-                             /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,4--6,10),
-                           false, true,
-                           Named
-                             (SynIdent (meh, None), false, None,
-                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,9--5,12)),
-                           App
-                             (NonAtomic, false, Ident getMeh,
-                              Const
-                                (Unit,
-                                 /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,22--5,24)),
-                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,15--5,24)),
-                           /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,4--5,24),
-                           { EqualsRange =
-                              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (5,13--5,14)
-                             InKeyword = None })],
-                       YieldOrReturn
-                         ((false, true), Ident bar,
-                          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (6,4--6,14)),
-                       /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,4--6,14),
-                       { EqualsRange =
-                          Some
-                            /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (3,13--3,14) }),
-                    /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,6--7,1)),
-                 /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,0--7,1)),
-              /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,0--7,1))],
-          PreXmlDocEmpty, [], None,
-          /root/MultipleSynExprAndBangHaveRangeThatStartsAtAnd!AndEndsAfterExpression.fs (2,0--7,1),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamedParameter.fs.bsl b/tests/service/data/SyntaxTree/NamedParameter.fs.bsl
deleted file mode 100644
index 7ba54fc16f7..00000000000
--- a/tests/service/data/SyntaxTree/NamedParameter.fs.bsl
+++ /dev/null
@@ -1,30 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/NamedParameter.fs", false, QualifiedNameOfFile NamedParameter, [],
-      [],
-      [SynModuleOrNamespace
-         ([NamedParameter], false, AnonModule,
-          [Expr
-             (App
-                (Atomic, false, Ident f,
-                 Paren
-                   (App
-                      (NonAtomic, false,
-                       App
-                         (NonAtomic, true,
-                          LongIdent
-                            (false,
-                             SynLongIdent
-                               ([op_Equality], [], [Some (OriginalNotation "=")]),
-                             None, /root/NamedParameter.fs (2,3--2,4)), Ident x,
-                          /root/NamedParameter.fs (2,2--2,4)),
-                       Const (Int32 4, /root/NamedParameter.fs (2,4--2,5)),
-                       /root/NamedParameter.fs (2,2--2,5)),
-                    /root/NamedParameter.fs (2,1--2,2),
-                    Some /root/NamedParameter.fs (2,5--2,6),
-                    /root/NamedParameter.fs (2,1--2,6)),
-                 /root/NamedParameter.fs (2,0--2,6)),
-              /root/NamedParameter.fs (2,0--2,6))], PreXmlDocEmpty, [], None,
-          /root/NamedParameter.fs (2,0--2,6), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NameofOperator.fs.bsl b/tests/service/data/SyntaxTree/NameofOperator.fs.bsl
deleted file mode 100644
index 610f4eeb513..00000000000
--- a/tests/service/data/SyntaxTree/NameofOperator.fs.bsl
+++ /dev/null
@@ -1,23 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/NameofOperator.fs", false, QualifiedNameOfFile NameofOperator, [],
-      [],
-      [SynModuleOrNamespace
-         ([NameofOperator], false, AnonModule,
-          [Expr
-             (App
-                (Atomic, false, Ident nameof,
-                 LongIdent
-                   (false,
-                    SynLongIdent
-                      ([op_Addition], [],
-                       [Some
-                          (OriginalNotationWithParen
-                             (/root/NameofOperator.fs (2,6--2,7), "+",
-                              /root/NameofOperator.fs (2,8--2,9)))]), None,
-                    /root/NameofOperator.fs (2,6--2,9)),
-                 /root/NameofOperator.fs (2,0--2,9)),
-              /root/NameofOperator.fs (2,0--2,9))], PreXmlDocEmpty, [], None,
-          /root/NameofOperator.fs (2,0--2,9), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs.bsl
deleted file mode 100644
index e08892d7b34..00000000000
--- a/tests/service/data/SyntaxTree/NamespaceShouldContainNamespaceKeyword.fs.bsl
+++ /dev/null
@@ -1,52 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/NamespaceShouldContainNamespaceKeyword.fs", false,
-      QualifiedNameOfFile NamespaceShouldContainNamespaceKeyword, [], [],
-      [SynModuleOrNamespace
-         ([Foo], false, DeclaredNamespace,
-          [NestedModule
-             (SynComponentInfo
-                ([], None, [], [Bar],
-                 PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), false,
-                 None,
-                 /root/NamespaceShouldContainNamespaceKeyword.fs (3,0--3,10)),
-              false,
-              [Let
-                 (false,
-                  [SynBinding
-                     (None, Normal, false, false, [],
-                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
-                      SynValData
-                        (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                         None),
-                      Named
-                        (SynIdent (a, None), false, None,
-                         /root/NamespaceShouldContainNamespaceKeyword.fs (4,4--4,5)),
-                      None,
-                      Const
-                        (Int32 42,
-                         /root/NamespaceShouldContainNamespaceKeyword.fs (4,8--4,10)),
-                      /root/NamespaceShouldContainNamespaceKeyword.fs (4,4--4,5),
-                      Yes
-                        /root/NamespaceShouldContainNamespaceKeyword.fs (4,0--4,10),
-                      { LeadingKeyword =
-                         Let
-                           /root/NamespaceShouldContainNamespaceKeyword.fs (4,0--4,3)
-                        InlineKeyword = None
-                        EqualsRange =
-                         Some
-                           /root/NamespaceShouldContainNamespaceKeyword.fs (4,6--4,7) })],
-                  /root/NamespaceShouldContainNamespaceKeyword.fs (4,0--4,10))],
-              false, /root/NamespaceShouldContainNamespaceKeyword.fs (3,0--4,10),
-              { ModuleKeyword =
-                 Some /root/NamespaceShouldContainNamespaceKeyword.fs (3,0--3,6)
-                EqualsRange =
-                 Some
-                   /root/NamespaceShouldContainNamespaceKeyword.fs (3,11--3,12) })],
-          PreXmlDocEmpty, [], None,
-          /root/NamespaceShouldContainNamespaceKeyword.fs (2,0--4,10),
-          { LeadingKeyword =
-             Namespace
-               /root/NamespaceShouldContainNamespaceKeyword.fs (2,0--2,9) })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs.bsl
deleted file mode 100644
index 85eb7b25f98..00000000000
--- a/tests/service/data/SyntaxTree/NestedElifInIfThenElse.fs.bsl
+++ /dev/null
@@ -1,33 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/NestedElifInIfThenElse.fs", false,
-      QualifiedNameOfFile NestedElifInIfThenElse, [], [],
-      [SynModuleOrNamespace
-         ([NestedElifInIfThenElse], false, AnonModule,
-          [Expr
-             (IfThenElse
-                (Ident a, Ident b,
-                 Some
-                   (IfThenElse
-                      (Ident c, Ident d, None,
-                       Yes /root/NestedElifInIfThenElse.fs (4,0--4,11), false,
-                       /root/NestedElifInIfThenElse.fs (4,0--4,13),
-                       { IfKeyword = /root/NestedElifInIfThenElse.fs (4,0--4,4)
-                         IsElif = true
-                         ThenKeyword =
-                          /root/NestedElifInIfThenElse.fs (4,7--4,11)
-                         ElseKeyword = None
-                         IfToThenRange =
-                          /root/NestedElifInIfThenElse.fs (4,0--4,11) })),
-                 Yes /root/NestedElifInIfThenElse.fs (2,0--2,9), false,
-                 /root/NestedElifInIfThenElse.fs (2,0--4,13),
-                 { IfKeyword = /root/NestedElifInIfThenElse.fs (2,0--2,2)
-                   IsElif = false
-                   ThenKeyword = /root/NestedElifInIfThenElse.fs (2,5--2,9)
-                   ElseKeyword = None
-                   IfToThenRange = /root/NestedElifInIfThenElse.fs (2,0--2,9) }),
-              /root/NestedElifInIfThenElse.fs (2,0--4,13))], PreXmlDocEmpty, [],
-          None, /root/NestedElifInIfThenElse.fs (2,0--5,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs.bsl
deleted file mode 100644
index 6d7a2363f81..00000000000
--- a/tests/service/data/SyntaxTree/NestedElseIfInIfThenElse.fs.bsl
+++ /dev/null
@@ -1,35 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/NestedElseIfInIfThenElse.fs", false,
-      QualifiedNameOfFile NestedElseIfInIfThenElse, [], [],
-      [SynModuleOrNamespace
-         ([NestedElseIfInIfThenElse], false, AnonModule,
-          [Expr
-             (IfThenElse
-                (Ident a, Ident b,
-                 Some
-                   (IfThenElse
-                      (Ident c, Ident d, None,
-                       Yes /root/NestedElseIfInIfThenElse.fs (5,4--5,13), false,
-                       /root/NestedElseIfInIfThenElse.fs (5,4--5,15),
-                       { IfKeyword =
-                          /root/NestedElseIfInIfThenElse.fs (5,4--5,6)
-                         IsElif = false
-                         ThenKeyword =
-                          /root/NestedElseIfInIfThenElse.fs (5,9--5,13)
-                         ElseKeyword = None
-                         IfToThenRange =
-                          /root/NestedElseIfInIfThenElse.fs (5,4--5,13) })),
-                 Yes /root/NestedElseIfInIfThenElse.fs (2,0--2,9), false,
-                 /root/NestedElseIfInIfThenElse.fs (2,0--5,15),
-                 { IfKeyword = /root/NestedElseIfInIfThenElse.fs (2,0--2,2)
-                   IsElif = false
-                   ThenKeyword = /root/NestedElseIfInIfThenElse.fs (2,5--2,9)
-                   ElseKeyword =
-                    Some /root/NestedElseIfInIfThenElse.fs (4,0--4,4)
-                   IfToThenRange = /root/NestedElseIfInIfThenElse.fs (2,0--2,9) }),
-              /root/NestedElseIfInIfThenElse.fs (2,0--5,15))], PreXmlDocEmpty,
-          [], None, /root/NestedElseIfInIfThenElse.fs (2,0--6,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
deleted file mode 100644
index 920dc323e71..00000000000
--- a/tests/service/data/SyntaxTree/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
+++ /dev/null
@@ -1,43 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/NestedElseIfOnTheSameLineInIfThenElse.fs", false,
-      QualifiedNameOfFile NestedElseIfOnTheSameLineInIfThenElse, [], [],
-      [SynModuleOrNamespace
-         ([NestedElseIfOnTheSameLineInIfThenElse], false, AnonModule,
-          [Expr
-             (IfThenElse
-                (Ident a, Ident b,
-                 Some
-                   (IfThenElse
-                      (Ident c, Ident d, None,
-                       Yes
-                         /root/NestedElseIfOnTheSameLineInIfThenElse.fs (4,5--4,14),
-                       false,
-                       /root/NestedElseIfOnTheSameLineInIfThenElse.fs (4,5--5,1),
-                       { IfKeyword =
-                          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (4,5--4,7)
-                         IsElif = false
-                         ThenKeyword =
-                          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (4,10--4,14)
-                         ElseKeyword = None
-                         IfToThenRange =
-                          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (4,5--4,14) })),
-                 Yes /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--2,9),
-                 false,
-                 /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--5,1),
-                 { IfKeyword =
-                    /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--2,2)
-                   IsElif = false
-                   ThenKeyword =
-                    /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,5--2,9)
-                   ElseKeyword =
-                    Some
-                      /root/NestedElseIfOnTheSameLineInIfThenElse.fs (4,0--4,4)
-                   IfToThenRange =
-                    /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--2,9) }),
-              /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--5,1))],
-          PreXmlDocEmpty, [], None,
-          /root/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--6,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi.bsl
deleted file mode 100644
index 490464fd944..00000000000
--- a/tests/service/data/SyntaxTree/NestedIfElseEndif,SignatureFile.fsi.bsl
+++ /dev/null
@@ -1,38 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/NestedIfElseEndif,SignatureFile.fsi",
-      QualifiedNameOfFile NestedIfElseEndif,SignatureFile, [], [],
-      [SynModuleOrNamespaceSig
-         ([Foobar], false, DeclaredNamespace,
-          [Val
-             (SynValSig
-                ([], SynIdent (v, None), SynValTyparDecls (None, true),
-                 LongIdent (SynLongIdent ([int], [], [None])),
-                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 Some
-                   (Const
-                      (Int32 3,
-                       /root/NestedIfElseEndif,SignatureFile.fsi (12,8--12,9))),
-                 /root/NestedIfElseEndif,SignatureFile.fsi (4,0--12,9),
-                 { LeadingKeyword =
-                    Val /root/NestedIfElseEndif,SignatureFile.fsi (4,0--4,3)
-                   InlineKeyword = None
-                   WithKeyword = None
-                   EqualsRange =
-                    Some /root/NestedIfElseEndif,SignatureFile.fsi (4,12--4,13) }),
-              /root/NestedIfElseEndif,SignatureFile.fsi (4,0--12,9))],
-          PreXmlDocEmpty, [], None,
-          /root/NestedIfElseEndif,SignatureFile.fsi (2,0--12,9),
-          { LeadingKeyword =
-             Namespace /root/NestedIfElseEndif,SignatureFile.fsi (2,0--2,9) })],
-      { ConditionalDirectives =
-         [If
-            (Ident "FOO", /root/NestedIfElseEndif,SignatureFile.fsi (5,4--5,11));
-          If
-            (Ident "MEH", /root/NestedIfElseEndif,SignatureFile.fsi (6,8--6,15));
-          Else /root/NestedIfElseEndif,SignatureFile.fsi (8,8--8,13);
-          EndIf /root/NestedIfElseEndif,SignatureFile.fsi (10,8--10,14);
-          Else /root/NestedIfElseEndif,SignatureFile.fsi (11,4--11,9);
-          EndIf /root/NestedIfElseEndif,SignatureFile.fsi (13,4--13,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/NestedIfElseEndif.fs.bsl
deleted file mode 100644
index 8c479e59458..00000000000
--- a/tests/service/data/SyntaxTree/NestedIfElseEndif.fs.bsl
+++ /dev/null
@@ -1,33 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/NestedIfElseEndif.fs", false, QualifiedNameOfFile NestedIfElseEndif,
-      [], [],
-      [SynModuleOrNamespace
-         ([NestedIfElseEndif], false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (v, None), false, None,
-                     /root/NestedIfElseEndif.fs (2,4--2,5)), None,
-                  Const (Int32 3, /root/NestedIfElseEndif.fs (10,8--10,9)),
-                  /root/NestedIfElseEndif.fs (2,4--2,5),
-                  Yes /root/NestedIfElseEndif.fs (2,0--10,9),
-                  { LeadingKeyword = Let /root/NestedIfElseEndif.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange = Some /root/NestedIfElseEndif.fs (2,6--2,7) })],
-              /root/NestedIfElseEndif.fs (2,0--10,9))], PreXmlDocEmpty, [], None,
-          /root/NestedIfElseEndif.fs (2,0--12,0), { LeadingKeyword = None })],
-      (true, false),
-      { ConditionalDirectives =
-         [If (Ident "FOO", /root/NestedIfElseEndif.fs (3,4--3,11));
-          If (Ident "MEH", /root/NestedIfElseEndif.fs (4,8--4,15));
-          Else /root/NestedIfElseEndif.fs (6,8--6,13);
-          EndIf /root/NestedIfElseEndif.fs (8,8--8,14);
-          Else /root/NestedIfElseEndif.fs (9,4--9,9);
-          EndIf /root/NestedIfElseEndif.fs (11,4--11,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi.bsl
deleted file mode 100644
index 18db4131920..00000000000
--- a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions,SignatureFile.fsi.bsl
+++ /dev/null
@@ -1,49 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi",
-      QualifiedNameOfFile NestedIfEndifWithComplexExpressions,SignatureFile, [],
-      [],
-      [SynModuleOrNamespaceSig
-         ([Foobar], false, DeclaredNamespace,
-          [Val
-             (SynValSig
-                ([], SynIdent (v, None), SynValTyparDecls (None, true),
-                 LongIdent (SynLongIdent ([int], [], [None])),
-                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 Some
-                   (Const
-                      (Int32 10,
-                       /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (12,4--12,6))),
-                 /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (4,0--12,6),
-                 { LeadingKeyword =
-                    Val
-                      /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (4,0--4,3)
-                   InlineKeyword = None
-                   WithKeyword = None
-                   EqualsRange =
-                    Some
-                      /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (4,12--4,13) }),
-              /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (4,0--12,6))],
-          PreXmlDocEmpty, [], None,
-          /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (2,0--12,6),
-          { LeadingKeyword =
-             Namespace
-               /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (2,0--2,9) })],
-      { ConditionalDirectives =
-         [If
-            (Not (Ident "DEBUG"),
-             /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (5,4--5,14));
-          If
-            (And (Ident "FOO", Ident "BAR"),
-             /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (6,8--6,22));
-          If
-            (Or (Ident "MEH", Ident "HMM"),
-             /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (7,12--7,26));
-          EndIf
-            /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (9,12--9,18);
-          EndIf
-            /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (10,8--10,14);
-          EndIf
-            /root/NestedIfEndifWithComplexExpressions,SignatureFile.fsi (11,4--11,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs.bsl b/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs.bsl
deleted file mode 100644
index 45231e75822..00000000000
--- a/tests/service/data/SyntaxTree/NestedIfEndifWithComplexExpressions.fs.bsl
+++ /dev/null
@@ -1,46 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/NestedIfEndifWithComplexExpressions.fs", false,
-      QualifiedNameOfFile NestedIfEndifWithComplexExpressions, [], [],
-      [SynModuleOrNamespace
-         ([NestedIfEndifWithComplexExpressions], false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (v, None), false, None,
-                     /root/NestedIfEndifWithComplexExpressions.fs (2,4--2,5)),
-                  None,
-                  ArbitraryAfterError
-                    ("localBinding1",
-                     /root/NestedIfEndifWithComplexExpressions.fs (2,7--2,7)),
-                  /root/NestedIfEndifWithComplexExpressions.fs (2,4--2,5),
-                  Yes /root/NestedIfEndifWithComplexExpressions.fs (2,4--2,7),
-                  { LeadingKeyword =
-                     Let /root/NestedIfEndifWithComplexExpressions.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some
-                       /root/NestedIfEndifWithComplexExpressions.fs (2,6--2,7) })],
-              /root/NestedIfEndifWithComplexExpressions.fs (2,0--2,7))],
-          PreXmlDocEmpty, [], None,
-          /root/NestedIfEndifWithComplexExpressions.fs (2,0--10,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives =
-         [If
-            (Not (Ident "DEBUG"),
-             /root/NestedIfEndifWithComplexExpressions.fs (3,4--3,14));
-          If
-            (And (Ident "FOO", Ident "BAR"),
-             /root/NestedIfEndifWithComplexExpressions.fs (4,8--4,22));
-          If
-            (Or (Ident "MEH", Ident "HMM"),
-             /root/NestedIfEndifWithComplexExpressions.fs (5,12--5,26));
-          EndIf /root/NestedIfEndifWithComplexExpressions.fs (7,12--7,18);
-          EndIf /root/NestedIfEndifWithComplexExpressions.fs (8,8--8,14);
-          EndIf /root/NestedIfEndifWithComplexExpressions.fs (9,4--9,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs
rename to tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs
diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
new file mode 100644
index 00000000000..57aa8bce3bd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
@@ -0,0 +1,45 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs",
+      false, QualifiedNameOfFile TopLevel, [], [],
+      [SynModuleOrNamespace
+         ([TopLevel], false, NamedModule,
+          [NestedModule
+             (SynComponentInfo
+                ([{ Attributes =
+                     [{ TypeName = SynLongIdent ([Foo], [], [None])
+                        ArgExpr =
+                         Const
+                           (Unit,
+                            /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,2--4,5))
+                        Target = None
+                        AppliesToGetterAndSetter = false
+                        Range =
+                         /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,2--4,5) }]
+                    Range =
+                     /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,0--4,7) }],
+                 None, [], [Nested],
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 None,
+                 /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (5,0--5,13)),
+              false,
+              [Expr
+                 (Const
+                    (Unit,
+                     /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (6,4--6,6)),
+                  /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (6,4--6,6))],
+              false,
+              /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,0--6,6),
+              { ModuleKeyword =
+                 Some
+                   /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (5,0--5,6)
+                EqualsRange =
+                 Some
+                   /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (5,14--5,15) })],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (2,0--6,6),
+          { LeadingKeyword =
+             Module
+               /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (2,0--2,6) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi
rename to tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
similarity index 51%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
rename to tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
index 4e1d5fd2b6c..fbb0c9ac6ee 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
+++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi",
+     ("/root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi",
       QualifiedNameOfFile
         RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule, [], [],
       [SynModuleOrNamespaceSig
@@ -12,17 +12,17 @@ SigFile
                         ArgExpr =
                          Const
                            (Unit,
-                            /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,2--4,5))
+                            /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,2--4,5))
                         Target = None
                         AppliesToGetterAndSetter = false
                         Range =
-                         /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,2--4,5) }]
+                         /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,2--4,5) }]
                     Range =
-                     /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,0--4,7) }],
+                     /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,0--4,7) }],
                  None, [], [Nested],
                  PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,0--5,13)),
+                 /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,0--5,13)),
               false,
               [Val
                  (SynValSig
@@ -31,25 +31,25 @@ SigFile
                      SynValInfo ([], SynArgInfo ([], false, None)), false, false,
                      PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                      None, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (6,4--6,15),
+                     /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (6,4--6,15),
                      { LeadingKeyword =
                         Val
-                          /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (6,4--6,7)
+                          /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (6,4--6,7)
                        InlineKeyword = None
                        WithKeyword = None
                        EqualsRange = None }),
-                  /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (6,4--6,15))],
-              /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,0--6,15),
+                  /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (6,4--6,15))],
+              /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (4,0--6,15),
               { ModuleKeyword =
                  Some
-                   /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,0--5,6)
+                   /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,0--5,6)
                 EqualsRange =
                  Some
-                   /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,14--5,15) })],
+                   /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (5,14--5,15) })],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (2,0--6,15),
+          /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (2,0--6,15),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (2,0--2,9) })],
+               /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs
rename to tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs
diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl
new file mode 100644
index 00000000000..5ac48ded3ce
--- /dev/null
+++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl
@@ -0,0 +1,31 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/NestedModule/RangeOfEqualSignShouldBePresent.fs", false,
+      QualifiedNameOfFile RangeOfEqualSignShouldBePresent, [], [],
+      [SynModuleOrNamespace
+         ([RangeOfEqualSignShouldBePresent], false, AnonModule,
+          [NestedModule
+             (SynComponentInfo
+                ([], None, [], [X],
+                 PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), false,
+                 None,
+                 /root/NestedModule/RangeOfEqualSignShouldBePresent.fs (2,0--2,8)),
+              false,
+              [Expr
+                 (Const
+                    (Unit,
+                     /root/NestedModule/RangeOfEqualSignShouldBePresent.fs (3,0--3,2)),
+                  /root/NestedModule/RangeOfEqualSignShouldBePresent.fs (3,0--3,2))],
+              false,
+              /root/NestedModule/RangeOfEqualSignShouldBePresent.fs (2,0--3,2),
+              { ModuleKeyword =
+                 Some
+                   /root/NestedModule/RangeOfEqualSignShouldBePresent.fs (2,0--2,6)
+                EqualsRange =
+                 Some
+                   /root/NestedModule/RangeOfEqualSignShouldBePresent.fs (2,9--2,10) })],
+          PreXmlDocEmpty, [], None,
+          /root/NestedModule/RangeOfEqualSignShouldBePresent.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi
rename to tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi.bsl
rename to tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl
index 9aee253eafc..52532608b3b 100644
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent,SignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl
@@ -1,7 +1,7 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi",
-      QualifiedNameOfFile RangeOfEqualSignShouldBePresent,SignatureFile, [], [],
+     ("/root/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi",
+      QualifiedNameOfFile RangeOfEqualSignShouldBePresentSignatureFile, [], [],
       [SynModuleOrNamespaceSig
          ([Foo], false, DeclaredNamespace,
           [NestedModule
@@ -9,7 +9,7 @@ SigFile
                 ([], None, [], [X],
                  PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,0--4,8)),
+                 /root/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi (4,0--4,8)),
               false,
               [Val
                  (SynValSig
@@ -18,25 +18,25 @@ SigFile
                      SynValInfo ([], SynArgInfo ([], false, None)), false, false,
                      PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                      None, None,
-                     /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (5,0--5,13),
+                     /root/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi (5,0--5,13),
                      { LeadingKeyword =
                         Val
-                          /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (5,0--5,3)
+                          /root/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi (5,0--5,3)
                        InlineKeyword = None
                        WithKeyword = None
                        EqualsRange = None }),
-                  /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (5,0--5,13))],
-              /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,0--5,13),
+                  /root/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi (5,0--5,13))],
+              /root/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi (4,0--5,13),
               { ModuleKeyword =
                  Some
-                   /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,0--4,6)
+                   /root/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi (4,0--4,6)
                 EqualsRange =
                  Some
-                   /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (4,9--4,10) })],
+                   /root/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi (4,9--4,10) })],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (2,0--5,13),
+          /root/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi (2,0--5,13),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfEqualSignShouldBePresent,SignatureFile.fsi (2,0--2,9) })],
+               /root/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi b/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi
rename to tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi
diff --git a/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
rename to tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
index 733a71cb0e0..5336774862a 100644
--- a/tests/service/data/SyntaxTree/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
+++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi",
+     ("/root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi",
       QualifiedNameOfFile
         RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl, [],
       [],
@@ -9,49 +9,49 @@ SigFile
           [Open
              (ModuleOrNamespace
                 (SynLongIdent ([System], [], [None]),
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,5--4,11)),
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,0--4,11));
+                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,5--4,11)),
+              /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (4,0--4,11));
            Open
              (ModuleOrNamespace
                 (SynLongIdent
                    ([System; Collections; Generic],
-                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,11--5,12);
-                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,23--5,24)],
+                    [/root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,11--5,12);
+                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,23--5,24)],
                     [None; None; None]),
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,5--5,31)),
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,0--5,31));
+                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,5--5,31)),
+              /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (5,0--5,31));
            Open
              (ModuleOrNamespace
                 (SynLongIdent
                    ([Microsoft; FSharp; Core],
-                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,14--6,15);
-                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,21--6,22)],
+                    [/root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,14--6,15);
+                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,21--6,22)],
                     [None; None; None]),
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,5--6,26)),
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,0--6,26));
+                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,5--6,26)),
+              /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (6,0--6,26));
            Open
              (ModuleOrNamespace
                 (SynLongIdent
                    ([Microsoft; FSharp; Collections],
-                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,14--7,15);
-                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,21--7,22)],
+                    [/root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,14--7,15);
+                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,21--7,22)],
                     [None; None; None]),
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,5--7,33)),
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,0--7,33));
+                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,5--7,33)),
+              /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (7,0--7,33));
            Open
              (ModuleOrNamespace
                 (SynLongIdent
                    ([System; Collections],
-                    [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (8,11--8,12)],
+                    [/root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (8,11--8,12)],
                     [None; None]),
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (8,5--8,23)),
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (8,0--8,23));
+                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (8,5--8,23)),
+              /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (8,0--8,23));
            NestedModule
              (SynComponentInfo
                 ([], None, [], [Tuple],
                  PreXmlDoc ((11,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (11,0--11,12)),
+                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (11,0--11,12)),
               false,
               [Types
                  ([SynTypeDefnSig
@@ -64,27 +64,27 @@ SigFile
                                 SynTyparDecl ([], SynTypar (T3, None, false));
                                 SynTyparDecl ([], SynTypar (T4, None, false))],
                                [],
-                               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,14--13,31))),
+                               /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,14--13,31))),
                          [], [Tuple],
                          PreXmlDoc ((13,4), FSharp.Compiler.Xml.XmlDocCollector),
                          true, None,
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,9--13,14)),
+                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,9--13,14)),
                       ObjectModel
                         (Unspecified,
                          [Interface
                             (LongIdent
                                (SynLongIdent
                                   ([IStructuralEquatable], [], [None])),
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (14,8--14,38));
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (14,8--14,38));
                           Interface
                             (LongIdent
                                (SynLongIdent
                                   ([IStructuralComparable], [], [None])),
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (15,8--15,39));
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (15,8--15,39));
                           Interface
                             (LongIdent
                                (SynLongIdent ([IComparable], [], [None])),
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,8--16,29));
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (16,8--16,29));
                           Member
                             (SynValSig
                                ([], SynIdent (new, None),
@@ -95,53 +95,53 @@ SigFile
                                       [Type
                                          (Var
                                             (SynTypar (T1, None, false),
-                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,14--17,17)));
+                                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,14--17,17)));
                                        Star
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,18--17,19);
+                                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,18--17,19);
                                        Type
                                          (Var
                                             (SynTypar (T2, None, false),
-                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,20--17,23)));
+                                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,20--17,23)));
                                        Star
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,24--17,25);
+                                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,24--17,25);
                                        Type
                                          (Var
                                             (SynTypar (T3, None, false),
-                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,26--17,29)));
+                                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,26--17,29)));
                                        Star
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,30--17,31);
+                                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,30--17,31);
                                        Type
                                          (Var
                                             (SynTypar (T4, None, false),
-                                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,32--17,35)))],
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,14--17,35)),
+                                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,32--17,35)))],
+                                      /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,14--17,35)),
                                    App
                                      (LongIdent
                                         (SynLongIdent ([Tuple], [], [None])),
                                       Some
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,44--17,45),
+                                        /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,44--17,45),
                                       [Var
                                          (SynTypar (T1, None, false),
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,45--17,48));
+                                          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,45--17,48));
                                        Var
                                          (SynTypar (T2, None, false),
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,49--17,52));
+                                          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,49--17,52));
                                        Var
                                          (SynTypar (T3, None, false),
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,53--17,56));
+                                          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,53--17,56));
                                        Var
                                          (SynTypar (T4, None, false),
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,57--17,60))],
-                                      [/root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,48--17,49);
-                                       /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,52--17,53);
-                                       /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,56--17,57)],
+                                          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,57--17,60))],
+                                      [/root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,48--17,49);
+                                       /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,52--17,53);
+                                       /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,56--17,57)],
                                       Some
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,60--17,61),
+                                        /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,60--17,61),
                                       false,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,39--17,61)),
-                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,14--17,61),
+                                      /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,39--17,61)),
+                                   /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,14--17,61),
                                    { ArrowRange =
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,36--17,38) }),
+                                      /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,36--17,38) }),
                                 SynValInfo
                                   ([[SynArgInfo ([], false, None);
                                      SynArgInfo ([], false, None);
@@ -150,10 +150,10 @@ SigFile
                                    SynArgInfo ([], false, None)), false, false,
                                 PreXmlDoc ((17,8), FSharp.Compiler.Xml.XmlDocCollector),
                                 None, None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,61),
+                                /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,61),
                                 { LeadingKeyword =
                                    New
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,11)
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,11)
                                   InlineKeyword = None
                                   WithKeyword = None
                                   EqualsRange = None }),
@@ -163,7 +163,7 @@ SigFile
                                IsFinal = false
                                GetterOrSetterIsCompilerGenerated = false
                                MemberKind = Constructor },
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,61),
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (17,8--17,61),
                              { GetSetKeywords = None });
                           Member
                             (SynValSig
@@ -171,19 +171,19 @@ SigFile
                                 SynValTyparDecls (None, true),
                                 Var
                                   (SynTypar (T1, None, false),
-                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,23--18,26)),
+                                   /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,23--18,26)),
                                 SynValInfo ([], SynArgInfo ([], false, None)),
                                 false, false,
                                 PreXmlDoc ((18,8), FSharp.Compiler.Xml.XmlDocCollector),
                                 None, None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,35),
+                                /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,35),
                                 { LeadingKeyword =
                                    Member
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,14)
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,14)
                                   InlineKeyword = None
                                   WithKeyword =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,27--18,31)
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,27--18,31)
                                   EqualsRange = None }),
                              { IsInstance = true
                                IsDispatchSlot = false
@@ -191,30 +191,30 @@ SigFile
                                IsFinal = false
                                GetterOrSetterIsCompilerGenerated = false
                                MemberKind = PropertyGet },
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,35),
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,8--18,35),
                              { GetSetKeywords =
                                 Some
                                   (Get
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,32--18,35)) });
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (18,32--18,35)) });
                           Member
                             (SynValSig
                                ([], SynIdent (Item2, None),
                                 SynValTyparDecls (None, true),
                                 Var
                                   (SynTypar (T2, None, false),
-                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,23--19,26)),
+                                   /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,23--19,26)),
                                 SynValInfo ([], SynArgInfo ([], false, None)),
                                 false, false,
                                 PreXmlDoc ((19,8), FSharp.Compiler.Xml.XmlDocCollector),
                                 None, None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,35),
+                                /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,35),
                                 { LeadingKeyword =
                                    Member
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,14)
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,14)
                                   InlineKeyword = None
                                   WithKeyword =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,27--19,31)
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,27--19,31)
                                   EqualsRange = None }),
                              { IsInstance = true
                                IsDispatchSlot = false
@@ -222,30 +222,30 @@ SigFile
                                IsFinal = false
                                GetterOrSetterIsCompilerGenerated = false
                                MemberKind = PropertyGet },
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,35),
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,8--19,35),
                              { GetSetKeywords =
                                 Some
                                   (Get
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,32--19,35)) });
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (19,32--19,35)) });
                           Member
                             (SynValSig
                                ([], SynIdent (Item3, None),
                                 SynValTyparDecls (None, true),
                                 Var
                                   (SynTypar (T3, None, false),
-                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,23--20,26)),
+                                   /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,23--20,26)),
                                 SynValInfo ([], SynArgInfo ([], false, None)),
                                 false, false,
                                 PreXmlDoc ((20,8), FSharp.Compiler.Xml.XmlDocCollector),
                                 None, None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,35),
+                                /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,35),
                                 { LeadingKeyword =
                                    Member
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,14)
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,14)
                                   InlineKeyword = None
                                   WithKeyword =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,27--20,31)
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,27--20,31)
                                   EqualsRange = None }),
                              { IsInstance = true
                                IsDispatchSlot = false
@@ -253,30 +253,30 @@ SigFile
                                IsFinal = false
                                GetterOrSetterIsCompilerGenerated = false
                                MemberKind = PropertyGet },
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,35),
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,8--20,35),
                              { GetSetKeywords =
                                 Some
                                   (Get
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,32--20,35)) });
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (20,32--20,35)) });
                           Member
                             (SynValSig
                                ([], SynIdent (Item4, None),
                                 SynValTyparDecls (None, true),
                                 Var
                                   (SynTypar (T4, None, false),
-                                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,23--21,26)),
+                                   /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,23--21,26)),
                                 SynValInfo ([], SynArgInfo ([], false, None)),
                                 false, false,
                                 PreXmlDoc ((21,8), FSharp.Compiler.Xml.XmlDocCollector),
                                 None, None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,8--21,35),
+                                /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,8--21,35),
                                 { LeadingKeyword =
                                    Member
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,8--21,14)
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,8--21,14)
                                   InlineKeyword = None
                                   WithKeyword =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,27--21,31)
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,27--21,31)
                                   EqualsRange = None }),
                              { IsInstance = true
                                IsDispatchSlot = false
@@ -284,35 +284,35 @@ SigFile
                                IsFinal = false
                                GetterOrSetterIsCompilerGenerated = false
                                MemberKind = PropertyGet },
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,8--21,35),
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,8--21,35),
                              { GetSetKeywords =
                                 Some
                                   (Get
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,32--21,35)) })],
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (14,8--21,35)),
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (21,32--21,35)) })],
+                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (14,8--21,35)),
                       [],
-                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,9--21,35),
+                      /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,9--21,35),
                       { LeadingKeyword =
                          Type
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,4--13,8)
+                           /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,4--13,8)
                         EqualsRange =
                          Some
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,32--13,33)
+                           /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,32--13,33)
                         WithKeyword = None })],
-                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,4--21,35))],
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (11,0--21,35),
+                  /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (13,4--21,35))],
+              /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (11,0--21,35),
               { ModuleKeyword =
                  Some
-                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (11,0--11,6)
+                   /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (11,0--11,6)
                 EqualsRange =
                  Some
-                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (11,13--11,14) });
+                   /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (11,13--11,14) });
            NestedModule
              (SynComponentInfo
                 ([], None, [], [Choice],
                  PreXmlDoc ((24,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (24,0--24,13)),
+                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (24,0--24,13)),
               false,
               [Types
                  ([SynTypeDefnSig
@@ -323,24 +323,24 @@ SigFile
                                 ArgExpr =
                                  Const
                                    (Unit,
-                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,6--27,24))
+                                    /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,6--27,24))
                                 Target = None
                                 AppliesToGetterAndSetter = false
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,6--27,24) };
+                                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,6--27,24) };
                               { TypeName =
                                  SynLongIdent
                                    ([StructuralComparison], [], [None])
                                 ArgExpr =
                                  Const
                                    (Unit,
-                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,26--27,46))
+                                    /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,26--27,46))
                                 Target = None
                                 AppliesToGetterAndSetter = false
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,26--27,46) }]
+                                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,26--27,46) }]
                             Range =
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,4--27,48) };
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (27,4--27,48) };
                           { Attributes =
                              [{ TypeName =
                                  SynLongIdent ([CompiledName], [], [None])
@@ -349,18 +349,18 @@ SigFile
                                    (Const
                                       (String
                                          ("FSharpChoice`6", Regular,
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,19--28,35)),
-                                       /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,19--28,35)),
-                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,18--28,19),
+                                          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,19--28,35)),
+                                       /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,19--28,35)),
+                                    /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,18--28,19),
                                     Some
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,35--28,36),
-                                    /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,18--28,36))
+                                      /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,35--28,36),
+                                    /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,18--28,36))
                                 Target = None
                                 AppliesToGetterAndSetter = false
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,6--28,36) }]
+                                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,6--28,36) }]
                             Range =
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,4--28,38) }],
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (28,4--28,38) }],
                          Some
                            (PostfixList
                               ([SynTyparDecl ([], SynTypar (T1, None, false));
@@ -370,11 +370,11 @@ SigFile
                                 SynTyparDecl ([], SynTypar (T5, None, false));
                                 SynTyparDecl ([], SynTypar (T6, None, false))],
                                [],
-                               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,15--29,40))),
+                               /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,15--29,40))),
                          [], [Choice],
                          PreXmlDoc ((27,4), FSharp.Compiler.Xml.XmlDocCollector),
                          true, None,
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,9--29,15)),
+                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,9--29,15)),
                       Simple
                         (Union
                            (None,
@@ -385,18 +385,18 @@ SigFile
                                      ([], false, None,
                                       Var
                                         (SynTypar (T1, None, false),
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (31,22--31,25)),
+                                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (31,22--31,25)),
                                       false,
                                       PreXmlDoc ((31,22), FSharp.Compiler.Xml.XmlDocCollector),
                                       None,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (31,22--31,25),
+                                      /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (31,22--31,25),
                                       { LeadingKeyword = None })],
                                 PreXmlDoc ((31,6), FSharp.Compiler.Xml.XmlDocCollector),
                                 None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,6--31,25),
+                                /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,6--31,25),
                                 { BarRange =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (31,6--31,7) });
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (31,6--31,7) });
                              SynUnionCase
                                ([], SynIdent (Choice2Of6, None),
                                 Fields
@@ -404,18 +404,18 @@ SigFile
                                      ([], false, None,
                                       Var
                                         (SynTypar (T2, None, false),
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (33,22--33,25)),
+                                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (33,22--33,25)),
                                       false,
                                       PreXmlDoc ((33,22), FSharp.Compiler.Xml.XmlDocCollector),
                                       None,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (33,22--33,25),
+                                      /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (33,22--33,25),
                                       { LeadingKeyword = None })],
                                 PreXmlDoc ((33,6), FSharp.Compiler.Xml.XmlDocCollector),
                                 None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (32,6--33,25),
+                                /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (32,6--33,25),
                                 { BarRange =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (33,6--33,7) });
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (33,6--33,7) });
                              SynUnionCase
                                ([], SynIdent (Choice3Of6, None),
                                 Fields
@@ -423,18 +423,18 @@ SigFile
                                      ([], false, None,
                                       Var
                                         (SynTypar (T3, None, false),
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (35,22--35,25)),
+                                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (35,22--35,25)),
                                       false,
                                       PreXmlDoc ((35,22), FSharp.Compiler.Xml.XmlDocCollector),
                                       None,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (35,22--35,25),
+                                      /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (35,22--35,25),
                                       { LeadingKeyword = None })],
                                 PreXmlDoc ((35,6), FSharp.Compiler.Xml.XmlDocCollector),
                                 None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (34,6--35,25),
+                                /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (34,6--35,25),
                                 { BarRange =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (35,6--35,7) });
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (35,6--35,7) });
                              SynUnionCase
                                ([], SynIdent (Choice4Of6, None),
                                 Fields
@@ -442,18 +442,18 @@ SigFile
                                      ([], false, None,
                                       Var
                                         (SynTypar (T4, None, false),
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (37,22--37,25)),
+                                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (37,22--37,25)),
                                       false,
                                       PreXmlDoc ((37,22), FSharp.Compiler.Xml.XmlDocCollector),
                                       None,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (37,22--37,25),
+                                      /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (37,22--37,25),
                                       { LeadingKeyword = None })],
                                 PreXmlDoc ((37,6), FSharp.Compiler.Xml.XmlDocCollector),
                                 None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (36,6--37,25),
+                                /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (36,6--37,25),
                                 { BarRange =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (37,6--37,7) });
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (37,6--37,7) });
                              SynUnionCase
                                ([], SynIdent (Choice5Of6, None),
                                 Fields
@@ -461,18 +461,18 @@ SigFile
                                      ([], false, None,
                                       Var
                                         (SynTypar (T5, None, false),
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (39,22--39,25)),
+                                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (39,22--39,25)),
                                       false,
                                       PreXmlDoc ((39,22), FSharp.Compiler.Xml.XmlDocCollector),
                                       None,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (39,22--39,25),
+                                      /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (39,22--39,25),
                                       { LeadingKeyword = None })],
                                 PreXmlDoc ((39,6), FSharp.Compiler.Xml.XmlDocCollector),
                                 None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (38,6--39,25),
+                                /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (38,6--39,25),
                                 { BarRange =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (39,6--39,7) });
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (39,6--39,7) });
                              SynUnionCase
                                ([], SynIdent (Choice6Of6, None),
                                 Fields
@@ -480,37 +480,37 @@ SigFile
                                      ([], false, None,
                                       Var
                                         (SynTypar (T6, None, false),
-                                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (41,22--41,25)),
+                                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (41,22--41,25)),
                                       false,
                                       PreXmlDoc ((41,22), FSharp.Compiler.Xml.XmlDocCollector),
                                       None,
-                                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (41,22--41,25),
+                                      /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (41,22--41,25),
                                       { LeadingKeyword = None })],
                                 PreXmlDoc ((41,6), FSharp.Compiler.Xml.XmlDocCollector),
                                 None,
-                                /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (40,6--41,25),
+                                /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (40,6--41,25),
                                 { BarRange =
                                    Some
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (41,6--41,7) })],
-                            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,6--41,25)),
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,6--41,25)),
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (41,6--41,7) })],
+                            /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,6--41,25)),
+                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (30,6--41,25)),
                       [],
-                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,4--41,25),
+                      /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,4--41,25),
                       { LeadingKeyword =
                          Type
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,4--29,8)
+                           /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,4--29,8)
                         EqualsRange =
                          Some
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,41--29,42)
+                           /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (29,41--29,42)
                         WithKeyword = None })],
-                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,4--41,25))],
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (24,0--41,25),
+                  /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (26,4--41,25))],
+              /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (24,0--41,25),
               { ModuleKeyword =
                  Some
-                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (24,0--24,6)
+                   /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (24,0--24,6)
                 EqualsRange =
                  Some
-                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (24,14--24,15) });
+                   /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (24,14--24,15) });
            NestedModule
              (SynComponentInfo
                 ([{ Attributes =
@@ -518,17 +518,17 @@ SigFile
                         ArgExpr =
                          Const
                            (Unit,
-                            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,2--46,10))
+                            /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,2--46,10))
                         Target = None
                         AppliesToGetterAndSetter = false
                         Range =
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,2--46,10) }]
+                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,2--46,10) }]
                     Range =
-                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,0--46,12) }],
+                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (46,0--46,12) }],
                  None, [], [Operators],
                  PreXmlDoc ((46,0), FSharp.Compiler.Xml.XmlDocCollector), false,
                  None,
-                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (47,0--47,16)),
+                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (47,0--47,16)),
               false,
               [Types
                  ([SynTypeDefnSig
@@ -538,15 +538,15 @@ SigFile
                            (PostfixList
                               ([SynTyparDecl ([], SynTypar (T, None, false))],
                                [],
-                               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,16--49,20))),
+                               /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,16--49,20))),
                          [], [[,]],
                          PreXmlDoc ((49,4), FSharp.Compiler.Xml.XmlDocCollector),
                          true, None,
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,9--49,16)),
+                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,9--49,16)),
                       Simple
                         (None
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,9--61,26),
-                         /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,9--61,26)),
+                           /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,9--61,26),
+                         /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,9--61,26)),
                       [Member
                          (SynValSig
                             ([{ Attributes =
@@ -557,18 +557,18 @@ SigFile
                                        (Const
                                           (String
                                              ("Length1", Regular,
-                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,23--50,32)),
-                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,23--50,32)),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,22--50,23),
+                                              /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,23--50,32)),
+                                           /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,23--50,32)),
+                                        /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,22--50,23),
                                         Some
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,32--50,33),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,22--50,33))
+                                          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,32--50,33),
+                                        /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,22--50,33))
                                     Target = None
                                     AppliesToGetterAndSetter = false
                                     Range =
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,10--50,33) }]
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,10--50,33) }]
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,8--50,35) }],
+                                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,8--50,35) }],
                              SynIdent (Length1, None),
                              SynValTyparDecls (None, true),
                              LongIdent (SynLongIdent ([int], [], [None])),
@@ -576,10 +576,10 @@ SigFile
                              false, false,
                              PreXmlDoc ((50,8), FSharp.Compiler.Xml.XmlDocCollector),
                              None, None,
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,8--52,28),
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,8--52,28),
                              { LeadingKeyword =
                                 Member
-                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,8--52,14)
+                                  /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (52,8--52,14)
                                InlineKeyword = None
                                WithKeyword = None
                                EqualsRange = None }),
@@ -589,7 +589,7 @@ SigFile
                             IsFinal = false
                             GetterOrSetterIsCompilerGenerated = false
                             MemberKind = PropertyGet },
-                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,8--52,28),
+                          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (50,8--52,28),
                           { GetSetKeywords = None });
                        Member
                          (SynValSig
@@ -601,18 +601,18 @@ SigFile
                                        (Const
                                           (String
                                              ("Length2", Regular,
-                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,23--53,32)),
-                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,23--53,32)),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,22--53,23),
+                                              /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,23--53,32)),
+                                           /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,23--53,32)),
+                                        /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,22--53,23),
                                         Some
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,32--53,33),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,22--53,33))
+                                          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,32--53,33),
+                                        /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,22--53,33))
                                     Target = None
                                     AppliesToGetterAndSetter = false
                                     Range =
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,10--53,33) }]
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,10--53,33) }]
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,8--53,35) }],
+                                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,8--53,35) }],
                              SynIdent (Length2, None),
                              SynValTyparDecls (None, true),
                              LongIdent (SynLongIdent ([int], [], [None])),
@@ -620,10 +620,10 @@ SigFile
                              false, false,
                              PreXmlDoc ((53,8), FSharp.Compiler.Xml.XmlDocCollector),
                              None, None,
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,8--55,28),
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,8--55,28),
                              { LeadingKeyword =
                                 Member
-                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,8--55,14)
+                                  /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (55,8--55,14)
                                InlineKeyword = None
                                WithKeyword = None
                                EqualsRange = None }),
@@ -633,7 +633,7 @@ SigFile
                             IsFinal = false
                             GetterOrSetterIsCompilerGenerated = false
                             MemberKind = PropertyGet },
-                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,8--55,28),
+                          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (53,8--55,28),
                           { GetSetKeywords = None });
                        Member
                          (SynValSig
@@ -645,18 +645,18 @@ SigFile
                                        (Const
                                           (String
                                              ("Base1", Regular,
-                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,23--56,30)),
-                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,23--56,30)),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,22--56,23),
+                                              /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,23--56,30)),
+                                           /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,23--56,30)),
+                                        /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,22--56,23),
                                         Some
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,30--56,31),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,22--56,31))
+                                          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,30--56,31),
+                                        /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,22--56,31))
                                     Target = None
                                     AppliesToGetterAndSetter = false
                                     Range =
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,10--56,31) }]
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,10--56,31) }]
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,8--56,33) }],
+                                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,8--56,33) }],
                              SynIdent (Base1, None),
                              SynValTyparDecls (None, true),
                              LongIdent (SynLongIdent ([int], [], [None])),
@@ -664,10 +664,10 @@ SigFile
                              false, false,
                              PreXmlDoc ((56,8), FSharp.Compiler.Xml.XmlDocCollector),
                              None, None,
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,8--58,26),
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,8--58,26),
                              { LeadingKeyword =
                                 Member
-                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,8--58,14)
+                                  /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (58,8--58,14)
                                InlineKeyword = None
                                WithKeyword = None
                                EqualsRange = None }),
@@ -677,7 +677,7 @@ SigFile
                             IsFinal = false
                             GetterOrSetterIsCompilerGenerated = false
                             MemberKind = PropertyGet },
-                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,8--58,26),
+                          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (56,8--58,26),
                           { GetSetKeywords = None });
                        Member
                          (SynValSig
@@ -689,18 +689,18 @@ SigFile
                                        (Const
                                           (String
                                              ("Base2", Regular,
-                                              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,23--59,30)),
-                                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,23--59,30)),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,22--59,23),
+                                              /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,23--59,30)),
+                                           /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,23--59,30)),
+                                        /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,22--59,23),
                                         Some
-                                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,30--59,31),
-                                        /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,22--59,31))
+                                          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,30--59,31),
+                                        /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,22--59,31))
                                     Target = None
                                     AppliesToGetterAndSetter = false
                                     Range =
-                                     /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,10--59,31) }]
+                                     /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,10--59,31) }]
                                 Range =
-                                 /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,8--59,33) }],
+                                 /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,8--59,33) }],
                              SynIdent (Base2, None),
                              SynValTyparDecls (None, true),
                              LongIdent (SynLongIdent ([int], [], [None])),
@@ -708,10 +708,10 @@ SigFile
                              false, false,
                              PreXmlDoc ((59,8), FSharp.Compiler.Xml.XmlDocCollector),
                              None, None,
-                             /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,8--61,26),
+                             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,8--61,26),
                              { LeadingKeyword =
                                 Member
-                                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (61,8--61,14)
+                                  /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (61,8--61,14)
                                InlineKeyword = None
                                WithKeyword = None
                                EqualsRange = None }),
@@ -721,37 +721,37 @@ SigFile
                             IsFinal = false
                             GetterOrSetterIsCompilerGenerated = false
                             MemberKind = PropertyGet },
-                          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,8--61,26),
+                          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (59,8--61,26),
                           { GetSetKeywords = None })],
-                      /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,9--61,26),
+                      /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,9--61,26),
                       { LeadingKeyword =
                          Type
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,4--49,8)
+                           /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,4--49,8)
                         EqualsRange = None
                         WithKeyword =
                          Some
-                           /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,21--49,25) })],
-                  /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,4--61,26))],
-              /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (45,0--61,26),
+                           /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,21--49,25) })],
+                  /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (49,4--61,26))],
+              /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (45,0--61,26),
               { ModuleKeyword =
                  Some
-                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (47,0--47,6)
+                   /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (47,0--47,6)
                 EqualsRange =
                  Some
-                   /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (47,17--47,18) })],
+                   /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (47,17--47,18) })],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (2,0--61,26),
+          /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (2,0--61,26),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (2,0--2,9) })],
+               /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (51,8--51,82);
+            /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (51,8--51,82);
           LineComment
-            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (54,8--54,84);
+            /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (54,8--54,84);
           LineComment
-            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (57,8--57,88);
+            /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (57,8--57,88);
           LineComment
-            /root/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (60,8--60,89)] },
+            /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (60,8--60,89)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
deleted file mode 100644
index bc2650c984f..00000000000
--- a/tests/service/data/SyntaxTree/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
+++ /dev/null
@@ -1,52 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs", false,
-      QualifiedNameOfFile NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith,
-      [], [],
-      [SynModuleOrNamespace
-         ([NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith], false,
-          AnonModule,
-          [Expr
-             (TryWith
-                (App
-                   (NonAtomic, false, Ident foo,
-                    Const
-                      (Unit,
-                       /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,8--3,10)),
-                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,4--3,10)),
-                 [SynMatchClause
-                    (Named
-                       (SynIdent (exn, None), false, None,
-                        /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,5--4,8)),
-                     None,
-                     Const
-                       (Unit,
-                        /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (6,4--6,6)),
-                     /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,5--6,6),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,9--4,11)
-                       BarRange = None })],
-                 /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--6,6),
-                 Yes
-                   /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--2,3),
-                 Yes
-                   /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,4),
-                 { TryKeyword =
-                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--2,3)
-                   TryToWithRange =
-                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--4,4)
-                   WithKeyword =
-                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,4)
-                   WithToEndRange =
-                    /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--6,6) }),
-              /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--6,6))],
-          PreXmlDocEmpty, [], None,
-          /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--7,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments =
-         [LineComment
-            /root/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,4--5,19)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorAsFunction.fs.bsl
deleted file mode 100644
index 966818666af..00000000000
--- a/tests/service/data/SyntaxTree/OperatorAsFunction.fs.bsl
+++ /dev/null
@@ -1,28 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/OperatorAsFunction.fs", false,
-      QualifiedNameOfFile OperatorAsFunction, [], [],
-      [SynModuleOrNamespace
-         ([OperatorAsFunction], false, AnonModule,
-          [Expr
-             (App
-                (NonAtomic, false,
-                 App
-                   (NonAtomic, false,
-                    LongIdent
-                      (false,
-                       SynLongIdent
-                         ([op_Addition], [],
-                          [Some
-                             (OriginalNotationWithParen
-                                (/root/OperatorAsFunction.fs (2,0--2,1), "+",
-                                 /root/OperatorAsFunction.fs (2,2--2,3)))]),
-                       None, /root/OperatorAsFunction.fs (2,0--2,3)),
-                    Const (Int32 3, /root/OperatorAsFunction.fs (2,4--2,5)),
-                    /root/OperatorAsFunction.fs (2,0--2,5)),
-                 Const (Int32 4, /root/OperatorAsFunction.fs (2,6--2,7)),
-                 /root/OperatorAsFunction.fs (2,0--2,7)),
-              /root/OperatorAsFunction.fs (2,0--2,7))], PreXmlDocEmpty, [], None,
-          /root/OperatorAsFunction.fs (2,0--2,7), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs.bsl b/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs.bsl
deleted file mode 100644
index 2ea6a141272..00000000000
--- a/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs.bsl
+++ /dev/null
@@ -1,38 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/OperatorInMatchPattern.fs", false,
-      QualifiedNameOfFile OperatorInMatchPattern, [], [],
-      [SynModuleOrNamespace
-         ([OperatorInMatchPattern], false, AnonModule,
-          [Expr
-             (Match
-                (Yes /root/OperatorInMatchPattern.fs (2,0--2,12), Ident x,
-                 [SynMatchClause
-                    (ListCons
-                       (Paren
-                          (Named
-                             (SynIdent (head, None), false, None,
-                              /root/OperatorInMatchPattern.fs (3,3--3,7)),
-                           /root/OperatorInMatchPattern.fs (3,2--3,8)),
-                        Paren
-                          (Named
-                             (SynIdent (tail, None), false, None,
-                              /root/OperatorInMatchPattern.fs (3,13--3,17)),
-                           /root/OperatorInMatchPattern.fs (3,12--3,18)),
-                        /root/OperatorInMatchPattern.fs (3,2--3,18),
-                        { ColonColonRange =
-                           /root/OperatorInMatchPattern.fs (3,9--3,11) }), None,
-                     Const (Unit, /root/OperatorInMatchPattern.fs (3,22--3,24)),
-                     /root/OperatorInMatchPattern.fs (3,2--3,24), Yes,
-                     { ArrowRange =
-                        Some /root/OperatorInMatchPattern.fs (3,19--3,21)
-                       BarRange =
-                        Some /root/OperatorInMatchPattern.fs (3,0--3,1) })],
-                 /root/OperatorInMatchPattern.fs (2,0--3,24),
-                 { MatchKeyword = /root/OperatorInMatchPattern.fs (2,0--2,5)
-                   WithKeyword = /root/OperatorInMatchPattern.fs (2,8--2,12) }),
-              /root/OperatorInMatchPattern.fs (2,0--3,24))], PreXmlDocEmpty, [],
-          None, /root/OperatorInMatchPattern.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs.bsl b/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs.bsl
deleted file mode 100644
index 9afd9ee8c40..00000000000
--- a/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs.bsl
+++ /dev/null
@@ -1,55 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/OperatorInSynPatLongIdent.fs", false,
-      QualifiedNameOfFile OperatorInSynPatLongIdent, [], [],
-      [SynModuleOrNamespace
-         ([OperatorInSynPatLongIdent], false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Paren
-                    (ListCons
-                       (Named
-                          (SynIdent (head, None), false, None,
-                           /root/OperatorInSynPatLongIdent.fs (2,5--2,9)),
-                        Named
-                          (SynIdent (tail, None), false, None,
-                           /root/OperatorInSynPatLongIdent.fs (2,11--2,15)),
-                        /root/OperatorInSynPatLongIdent.fs (2,5--2,15),
-                        { ColonColonRange =
-                           /root/OperatorInSynPatLongIdent.fs (2,9--2,11) }),
-                     /root/OperatorInSynPatLongIdent.fs (2,4--2,16)), None,
-                  ArrayOrListComputed
-                    (false,
-                     Sequential
-                       (SuppressNeither, true,
-                        Const
-                          (Int32 1,
-                           /root/OperatorInSynPatLongIdent.fs (2,22--2,23)),
-                        Sequential
-                          (SuppressNeither, true,
-                           Const
-                             (Int32 2,
-                              /root/OperatorInSynPatLongIdent.fs (2,24--2,25)),
-                           Const
-                             (Int32 4,
-                              /root/OperatorInSynPatLongIdent.fs (2,26--2,27)),
-                           /root/OperatorInSynPatLongIdent.fs (2,24--2,27)),
-                        /root/OperatorInSynPatLongIdent.fs (2,22--2,27)),
-                     /root/OperatorInSynPatLongIdent.fs (2,20--2,28)),
-                  /root/OperatorInSynPatLongIdent.fs (2,4--2,16),
-                  Yes /root/OperatorInSynPatLongIdent.fs (2,0--2,28),
-                  { LeadingKeyword =
-                     Let /root/OperatorInSynPatLongIdent.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some /root/OperatorInSynPatLongIdent.fs (2,17--2,18) })],
-              /root/OperatorInSynPatLongIdent.fs (2,0--2,28))], PreXmlDocEmpty,
-          [], None, /root/OperatorInSynPatLongIdent.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ActivePatternAsFunction.fs b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ActivePatternAsFunction.fs
rename to tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs
diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl
new file mode 100644
index 00000000000..02c56e156cd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl
@@ -0,0 +1,29 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorName/ActivePatternAsFunction.fs", false,
+      QualifiedNameOfFile ActivePatternAsFunction, [], [],
+      [SynModuleOrNamespace
+         ([ActivePatternAsFunction], false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false,
+                 LongIdent
+                   (false,
+                    SynLongIdent
+                      ([|Odd|Even|], [],
+                       [Some
+                          (HasParenthesis
+                             (/root/OperatorName/ActivePatternAsFunction.fs (2,0--2,1),
+                              /root/OperatorName/ActivePatternAsFunction.fs (2,11--2,12)))]),
+                    None,
+                    /root/OperatorName/ActivePatternAsFunction.fs (2,0--2,12)),
+                 Const
+                   (Int32 4,
+                    /root/OperatorName/ActivePatternAsFunction.fs (2,13--2,14)),
+                 /root/OperatorName/ActivePatternAsFunction.fs (2,0--2,14)),
+              /root/OperatorName/ActivePatternAsFunction.fs (2,0--2,14))],
+          PreXmlDocEmpty, [], None,
+          /root/OperatorName/ActivePatternAsFunction.fs (2,0--2,14),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ActivePatternDefinition.fs b/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ActivePatternDefinition.fs
rename to tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs
diff --git a/tests/service/data/SyntaxTree/ActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl
similarity index 50%
rename from tests/service/data/SyntaxTree/ActivePatternDefinition.fs.bsl
rename to tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl
index 7b2a2acdb93..2d277ecb6ab 100644
--- a/tests/service/data/SyntaxTree/ActivePatternDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/ActivePatternDefinition.fs", false,
+     ("/root/OperatorName/ActivePatternDefinition.fs", false,
       QualifiedNameOfFile ActivePatternDefinition, [], [],
       [SynModuleOrNamespace
          ([ActivePatternDefinition], false, AnonModule,
@@ -19,19 +19,21 @@ ImplFile
                        ([|Odd|Even|], [],
                         [Some
                            (HasParenthesis
-                              (/root/ActivePatternDefinition.fs (2,4--2,5),
-                               /root/ActivePatternDefinition.fs (2,15--2,16)))]),
+                              (/root/OperatorName/ActivePatternDefinition.fs (2,4--2,5),
+                               /root/OperatorName/ActivePatternDefinition.fs (2,15--2,16)))]),
                      None, None,
                      Pats
                        [Paren
                           (Typed
                              (Named
                                 (SynIdent (a, None), false, None,
-                                 /root/ActivePatternDefinition.fs (2,18--2,19)),
+                                 /root/OperatorName/ActivePatternDefinition.fs (2,18--2,19)),
                               LongIdent (SynLongIdent ([int], [], [None])),
-                              /root/ActivePatternDefinition.fs (2,18--2,24)),
-                           /root/ActivePatternDefinition.fs (2,17--2,25))], None,
-                     /root/ActivePatternDefinition.fs (2,4--2,25)), None,
+                              /root/OperatorName/ActivePatternDefinition.fs (2,18--2,24)),
+                           /root/OperatorName/ActivePatternDefinition.fs (2,17--2,25))],
+                     None,
+                     /root/OperatorName/ActivePatternDefinition.fs (2,4--2,25)),
+                  None,
                   IfThenElse
                     (App
                        (NonAtomic, false,
@@ -42,7 +44,7 @@ ImplFile
                               SynLongIdent
                                 ([op_Equality], [],
                                  [Some (OriginalNotation "=")]), None,
-                              /root/ActivePatternDefinition.fs (2,37--2,38)),
+                              /root/OperatorName/ActivePatternDefinition.fs (2,37--2,38)),
                            App
                              (NonAtomic, false,
                               App
@@ -52,37 +54,45 @@ ImplFile
                                     SynLongIdent
                                       ([op_Modulus], [],
                                        [Some (OriginalNotation "%")]), None,
-                                    /root/ActivePatternDefinition.fs (2,33--2,34)),
+                                    /root/OperatorName/ActivePatternDefinition.fs (2,33--2,34)),
                                  Ident a,
-                                 /root/ActivePatternDefinition.fs (2,31--2,34)),
+                                 /root/OperatorName/ActivePatternDefinition.fs (2,31--2,34)),
                               Const
                                 (Int32 2,
-                                 /root/ActivePatternDefinition.fs (2,35--2,36)),
-                              /root/ActivePatternDefinition.fs (2,31--2,36)),
-                           /root/ActivePatternDefinition.fs (2,31--2,38)),
+                                 /root/OperatorName/ActivePatternDefinition.fs (2,35--2,36)),
+                              /root/OperatorName/ActivePatternDefinition.fs (2,31--2,36)),
+                           /root/OperatorName/ActivePatternDefinition.fs (2,31--2,38)),
                         Const
                           (Int32 0,
-                           /root/ActivePatternDefinition.fs (2,39--2,40)),
-                        /root/ActivePatternDefinition.fs (2,31--2,40)),
+                           /root/OperatorName/ActivePatternDefinition.fs (2,39--2,40)),
+                        /root/OperatorName/ActivePatternDefinition.fs (2,31--2,40)),
                      Ident Even, Some (Ident Odd),
-                     Yes /root/ActivePatternDefinition.fs (2,28--2,45), false,
-                     /root/ActivePatternDefinition.fs (2,28--2,59),
-                     { IfKeyword = /root/ActivePatternDefinition.fs (2,28--2,30)
+                     Yes
+                       /root/OperatorName/ActivePatternDefinition.fs (2,28--2,45),
+                     false,
+                     /root/OperatorName/ActivePatternDefinition.fs (2,28--2,59),
+                     { IfKeyword =
+                        /root/OperatorName/ActivePatternDefinition.fs (2,28--2,30)
                        IsElif = false
                        ThenKeyword =
-                        /root/ActivePatternDefinition.fs (2,41--2,45)
+                        /root/OperatorName/ActivePatternDefinition.fs (2,41--2,45)
                        ElseKeyword =
-                        Some /root/ActivePatternDefinition.fs (2,51--2,55)
+                        Some
+                          /root/OperatorName/ActivePatternDefinition.fs (2,51--2,55)
                        IfToThenRange =
-                        /root/ActivePatternDefinition.fs (2,28--2,45) }),
-                  /root/ActivePatternDefinition.fs (2,4--2,25), NoneAtLet,
+                        /root/OperatorName/ActivePatternDefinition.fs (2,28--2,45) }),
+                  /root/OperatorName/ActivePatternDefinition.fs (2,4--2,25),
+                  NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/ActivePatternDefinition.fs (2,0--2,3)
+                     Let
+                       /root/OperatorName/ActivePatternDefinition.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
-                     Some /root/ActivePatternDefinition.fs (2,26--2,27) })],
-              /root/ActivePatternDefinition.fs (2,0--2,59))], PreXmlDocEmpty, [],
-          None, /root/ActivePatternDefinition.fs (2,0--3,0),
+                     Some
+                       /root/OperatorName/ActivePatternDefinition.fs (2,26--2,27) })],
+              /root/OperatorName/ActivePatternDefinition.fs (2,0--2,59))],
+          PreXmlDocEmpty, [], None,
+          /root/OperatorName/ActivePatternDefinition.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs b/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs
rename to tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs
diff --git a/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl
similarity index 57%
rename from tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs.bsl
rename to tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl
index 69c805e4d15..7772e0000b0 100644
--- a/tests/service/data/SyntaxTree/ActivePatternIdentifierInPrivateMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/ActivePatternIdentifierInPrivateMember.fs", false,
+     ("/root/OperatorName/ActivePatternIdentifierInPrivateMember.fs", false,
       QualifiedNameOfFile ActivePatternIdentifierInPrivateMember, [], [],
       [SynModuleOrNamespace
          ([ActivePatternIdentifierInPrivateMember], false, AnonModule,
@@ -10,17 +10,17 @@ ImplFile
                     ([], None, [], [A],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/ActivePatternIdentifierInPrivateMember.fs (2,5--2,6)),
+                     /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/ActivePatternIdentifierInPrivateMember.fs (2,6--2,8)),
+                            /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (2,6--2,8)),
                          None,
                          PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/ActivePatternIdentifierInPrivateMember.fs (2,5--2,6),
+                         /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (2,5--2,6),
                          { AsKeyword = None });
                       Member
                         (SynBinding
@@ -39,17 +39,17 @@ ImplFile
                             LongIdent
                               (SynLongIdent
                                  ([_; |A'|],
-                                  [/root/ActivePatternIdentifierInPrivateMember.fs (3,20--3,21)],
+                                  [/root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (3,20--3,21)],
                                   [None;
                                    Some
                                      (HasParenthesis
-                                        (/root/ActivePatternIdentifierInPrivateMember.fs (3,21--3,22),
-                                         /root/ActivePatternIdentifierInPrivateMember.fs (5,5--5,6)))]),
+                                        (/root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (3,21--3,22),
+                                         /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (5,5--5,6)))]),
                                None, None, Pats [],
                                Some
                                  (Private
-                                    /root/ActivePatternIdentifierInPrivateMember.fs (3,11--3,18)),
-                               /root/ActivePatternIdentifierInPrivateMember.fs (3,11--5,6)),
+                                    /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (3,11--3,18)),
+                               /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (3,11--5,6)),
                             None,
                             LongIdent
                               (false,
@@ -57,43 +57,43 @@ ImplFile
                                  ([|Lazy|], [],
                                   [Some
                                      (HasParenthesis
-                                        (/root/ActivePatternIdentifierInPrivateMember.fs (5,9--5,10),
-                                         /root/ActivePatternIdentifierInPrivateMember.fs (7,5--7,6)))]),
+                                        (/root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (5,9--5,10),
+                                         /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (7,5--7,6)))]),
                                None,
-                               /root/ActivePatternIdentifierInPrivateMember.fs (5,9--7,6)),
-                            /root/ActivePatternIdentifierInPrivateMember.fs (3,11--5,6),
+                               /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (5,9--7,6)),
+                            /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (3,11--5,6),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                Member
-                                 /root/ActivePatternIdentifierInPrivateMember.fs (3,4--3,10)
+                                 /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (3,4--3,10)
                               InlineKeyword = None
                               EqualsRange =
                                Some
-                                 /root/ActivePatternIdentifierInPrivateMember.fs (5,7--5,8) }),
-                         /root/ActivePatternIdentifierInPrivateMember.fs (3,4--7,6))],
-                     /root/ActivePatternIdentifierInPrivateMember.fs (3,4--7,6)),
+                                 /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (5,7--5,8) }),
+                         /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (3,4--7,6))],
+                     /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (3,4--7,6)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/ActivePatternIdentifierInPrivateMember.fs (2,6--2,8)),
+                           /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (2,6--2,8)),
                         None,
                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/ActivePatternIdentifierInPrivateMember.fs (2,5--2,6),
+                        /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/ActivePatternIdentifierInPrivateMember.fs (2,5--7,6),
+                  /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (2,5--7,6),
                   { LeadingKeyword =
                      Type
-                       /root/ActivePatternIdentifierInPrivateMember.fs (2,0--2,4)
+                       /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/ActivePatternIdentifierInPrivateMember.fs (2,9--2,10)
+                       /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/ActivePatternIdentifierInPrivateMember.fs (2,0--7,6))],
+              /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (2,0--7,6))],
           PreXmlDocEmpty, [], None,
-          /root/ActivePatternIdentifierInPrivateMember.fs (2,0--8,0),
+          /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (2,0--8,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs b/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/CustomOperatorDefinition.fs
rename to tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs
diff --git a/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/CustomOperatorDefinition.fs.bsl
rename to tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl
index c50e1109023..c5559f76147 100644
--- a/tests/service/data/SyntaxTree/CustomOperatorDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/CustomOperatorDefinition.fs", false,
+     ("/root/OperatorName/CustomOperatorDefinition.fs", false,
       QualifiedNameOfFile CustomOperatorDefinition, [], [],
       [SynModuleOrNamespace
          ([CustomOperatorDefinition], false, AnonModule,
@@ -20,17 +20,20 @@ ImplFile
                        ([op_Addition], [],
                         [Some
                            (OriginalNotationWithParen
-                              (/root/CustomOperatorDefinition.fs (2,4--2,5), "+",
-                               /root/CustomOperatorDefinition.fs (2,6--2,7)))]),
+                              (/root/OperatorName/CustomOperatorDefinition.fs (2,4--2,5),
+                               "+",
+                               /root/OperatorName/CustomOperatorDefinition.fs (2,6--2,7)))]),
                      None, None,
                      Pats
                        [Named
                           (SynIdent (a, None), false, None,
-                           /root/CustomOperatorDefinition.fs (2,8--2,9));
+                           /root/OperatorName/CustomOperatorDefinition.fs (2,8--2,9));
                         Named
                           (SynIdent (b, None), false, None,
-                           /root/CustomOperatorDefinition.fs (2,10--2,11))],
-                     None, /root/CustomOperatorDefinition.fs (2,4--2,11)), None,
+                           /root/OperatorName/CustomOperatorDefinition.fs (2,10--2,11))],
+                     None,
+                     /root/OperatorName/CustomOperatorDefinition.fs (2,4--2,11)),
+                  None,
                   App
                     (NonAtomic, false,
                      App
@@ -39,17 +42,24 @@ ImplFile
                           (false,
                            SynLongIdent
                              ([op_Addition], [], [Some (OriginalNotation "+")]),
-                           None, /root/CustomOperatorDefinition.fs (2,16--2,17)),
-                        Ident a, /root/CustomOperatorDefinition.fs (2,14--2,17)),
-                     Ident b, /root/CustomOperatorDefinition.fs (2,14--2,19)),
-                  /root/CustomOperatorDefinition.fs (2,4--2,11), NoneAtLet,
+                           None,
+                           /root/OperatorName/CustomOperatorDefinition.fs (2,16--2,17)),
+                        Ident a,
+                        /root/OperatorName/CustomOperatorDefinition.fs (2,14--2,17)),
+                     Ident b,
+                     /root/OperatorName/CustomOperatorDefinition.fs (2,14--2,19)),
+                  /root/OperatorName/CustomOperatorDefinition.fs (2,4--2,11),
+                  NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/CustomOperatorDefinition.fs (2,0--2,3)
+                     Let
+                       /root/OperatorName/CustomOperatorDefinition.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
-                     Some /root/CustomOperatorDefinition.fs (2,12--2,13) })],
-              /root/CustomOperatorDefinition.fs (2,0--2,19))], PreXmlDocEmpty,
-          [], None, /root/CustomOperatorDefinition.fs (2,0--3,0),
+                     Some
+                       /root/OperatorName/CustomOperatorDefinition.fs (2,12--2,13) })],
+              /root/OperatorName/CustomOperatorDefinition.fs (2,0--2,19))],
+          PreXmlDocEmpty, [], None,
+          /root/OperatorName/CustomOperatorDefinition.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs b/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/DetectDifferenceBetweenCompiledOperators.fs
rename to tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs
diff --git a/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl
new file mode 100644
index 00000000000..47f33039bf1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl
@@ -0,0 +1,41 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs", false,
+      QualifiedNameOfFile DetectDifferenceBetweenCompiledOperators, [], [],
+      [SynModuleOrNamespace
+         ([DetectDifferenceBetweenCompiledOperators], false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false,
+                 App
+                   (NonAtomic, false,
+                    LongIdent
+                      (false,
+                       SynLongIdent
+                         ([op_Addition], [],
+                          [Some
+                             (OriginalNotationWithParen
+                                (/root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,1),
+                                 "+",
+                                 /root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs (2,2--2,3)))]),
+                       None,
+                       /root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,3)),
+                    Ident a,
+                    /root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,5)),
+                 Ident b,
+                 /root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,7)),
+              /root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs (2,0--2,7));
+           Expr
+             (App
+                (NonAtomic, false,
+                 App
+                   (NonAtomic, false, Ident op_Addition, Ident a,
+                    /root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs (3,0--3,13)),
+                 Ident b,
+                 /root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs (3,0--3,15)),
+              /root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs (3,0--3,15))],
+          PreXmlDocEmpty, [], None,
+          /root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs (2,0--3,15),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InfixOperation.fs b/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/InfixOperation.fs
rename to tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs
diff --git a/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl
new file mode 100644
index 00000000000..cb4578ae268
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl
@@ -0,0 +1,27 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorName/InfixOperation.fs", false,
+      QualifiedNameOfFile InfixOperation, [], [],
+      [SynModuleOrNamespace
+         ([InfixOperation], false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false,
+                 App
+                   (NonAtomic, true,
+                    LongIdent
+                      (false,
+                       SynLongIdent
+                         ([op_Addition], [], [Some (OriginalNotation "+")]),
+                       None, /root/OperatorName/InfixOperation.fs (2,2--2,3)),
+                    Const
+                      (Int32 1, /root/OperatorName/InfixOperation.fs (2,0--2,1)),
+                    /root/OperatorName/InfixOperation.fs (2,0--2,3)),
+                 Const
+                   (Int32 1, /root/OperatorName/InfixOperation.fs (2,4--2,5)),
+                 /root/OperatorName/InfixOperation.fs (2,0--2,5)),
+              /root/OperatorName/InfixOperation.fs (2,0--2,5))], PreXmlDocEmpty,
+          [], None, /root/OperatorName/InfixOperation.fs (2,0--2,5),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamedParameter.fs b/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NamedParameter.fs
rename to tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs
diff --git a/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl
new file mode 100644
index 00000000000..ed1a96e72bd
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl
@@ -0,0 +1,35 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorName/NamedParameter.fs", false,
+      QualifiedNameOfFile NamedParameter, [], [],
+      [SynModuleOrNamespace
+         ([NamedParameter], false, AnonModule,
+          [Expr
+             (App
+                (Atomic, false, Ident f,
+                 Paren
+                   (App
+                      (NonAtomic, false,
+                       App
+                         (NonAtomic, true,
+                          LongIdent
+                            (false,
+                             SynLongIdent
+                               ([op_Equality], [], [Some (OriginalNotation "=")]),
+                             None,
+                             /root/OperatorName/NamedParameter.fs (2,3--2,4)),
+                          Ident x,
+                          /root/OperatorName/NamedParameter.fs (2,2--2,4)),
+                       Const
+                         (Int32 4,
+                          /root/OperatorName/NamedParameter.fs (2,4--2,5)),
+                       /root/OperatorName/NamedParameter.fs (2,2--2,5)),
+                    /root/OperatorName/NamedParameter.fs (2,1--2,2),
+                    Some /root/OperatorName/NamedParameter.fs (2,5--2,6),
+                    /root/OperatorName/NamedParameter.fs (2,1--2,6)),
+                 /root/OperatorName/NamedParameter.fs (2,0--2,6)),
+              /root/OperatorName/NamedParameter.fs (2,0--2,6))], PreXmlDocEmpty,
+          [], None, /root/OperatorName/NamedParameter.fs (2,0--2,6),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NameofOperator.fs b/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NameofOperator.fs
rename to tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs
diff --git a/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl
new file mode 100644
index 00000000000..45ccdb12a8c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl
@@ -0,0 +1,25 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorName/NameofOperator.fs", false,
+      QualifiedNameOfFile NameofOperator, [], [],
+      [SynModuleOrNamespace
+         ([NameofOperator], false, AnonModule,
+          [Expr
+             (App
+                (Atomic, false, Ident nameof,
+                 LongIdent
+                   (false,
+                    SynLongIdent
+                      ([op_Addition], [],
+                       [Some
+                          (OriginalNotationWithParen
+                             (/root/OperatorName/NameofOperator.fs (2,6--2,7),
+                              "+",
+                              /root/OperatorName/NameofOperator.fs (2,8--2,9)))]),
+                    None, /root/OperatorName/NameofOperator.fs (2,6--2,9)),
+                 /root/OperatorName/NameofOperator.fs (2,0--2,9)),
+              /root/OperatorName/NameofOperator.fs (2,0--2,9))], PreXmlDocEmpty,
+          [], None, /root/OperatorName/NameofOperator.fs (2,0--2,9),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs b/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs
rename to tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs
diff --git a/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl
similarity index 61%
rename from tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs.bsl
rename to tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl
index 00a7f94e1a9..144e0af8187 100644
--- a/tests/service/data/SyntaxTree/ObjectModelWithTwoMembers.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/ObjectModelWithTwoMembers.fs", false,
+     ("/root/OperatorName/ObjectModelWithTwoMembers.fs", false,
       QualifiedNameOfFile ObjectModelWithTwoMembers, [], [],
       [SynModuleOrNamespace
          ([ObjectModelWithTwoMembers], false, AnonModule,
@@ -9,16 +9,18 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/ObjectModelWithTwoMembers.fs (2,5--2,6)),
+                     false, None,
+                     /root/OperatorName/ObjectModelWithTwoMembers.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
-                           ([], /root/ObjectModelWithTwoMembers.fs (2,6--2,8)),
+                           ([],
+                            /root/OperatorName/ObjectModelWithTwoMembers.fs (2,6--2,8)),
                          None,
                          PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/ObjectModelWithTwoMembers.fs (2,5--2,6),
+                         /root/OperatorName/ObjectModelWithTwoMembers.fs (2,5--2,6),
                          { AsKeyword = None });
                       LetBindings
                         ([SynBinding
@@ -30,22 +32,23 @@ ImplFile
                                 None),
                              Named
                                (SynIdent (allowInto, None), false, None,
-                                /root/ObjectModelWithTwoMembers.fs (3,16--3,25)),
+                                /root/OperatorName/ObjectModelWithTwoMembers.fs (3,16--3,25)),
                              None,
                              Const
                                (Int32 0,
-                                /root/ObjectModelWithTwoMembers.fs (3,28--3,29)),
-                             /root/ObjectModelWithTwoMembers.fs (3,16--3,25),
-                             Yes /root/ObjectModelWithTwoMembers.fs (3,4--3,29),
+                                /root/OperatorName/ObjectModelWithTwoMembers.fs (3,28--3,29)),
+                             /root/OperatorName/ObjectModelWithTwoMembers.fs (3,16--3,25),
+                             Yes
+                               /root/OperatorName/ObjectModelWithTwoMembers.fs (3,4--3,29),
                              { LeadingKeyword =
                                 Let
-                                  /root/ObjectModelWithTwoMembers.fs (3,4--3,7)
+                                  /root/OperatorName/ObjectModelWithTwoMembers.fs (3,4--3,7)
                                InlineKeyword = None
                                EqualsRange =
                                 Some
-                                  /root/ObjectModelWithTwoMembers.fs (3,26--3,27) })],
+                                  /root/OperatorName/ObjectModelWithTwoMembers.fs (3,26--3,27) })],
                          false, false,
-                         /root/ObjectModelWithTwoMembers.fs (3,4--3,29));
+                         /root/OperatorName/ObjectModelWithTwoMembers.fs (3,4--3,29));
                       GetSetMember
                         (Some
                            (SynBinding
@@ -66,26 +69,26 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([_; AllowIntoPattern],
-                                     [/root/ObjectModelWithTwoMembers.fs (4,12--4,13)],
+                                     [/root/OperatorName/ObjectModelWithTwoMembers.fs (4,12--4,13)],
                                      [None; None]), Some get, None,
                                   Pats
                                     [Paren
                                        (Const
                                           (Unit,
-                                           /root/ObjectModelWithTwoMembers.fs (4,38--4,40)),
-                                        /root/ObjectModelWithTwoMembers.fs (4,38--4,40))],
+                                           /root/OperatorName/ObjectModelWithTwoMembers.fs (4,38--4,40)),
+                                        /root/OperatorName/ObjectModelWithTwoMembers.fs (4,38--4,40))],
                                   None,
-                                  /root/ObjectModelWithTwoMembers.fs (4,35--4,40)),
+                                  /root/OperatorName/ObjectModelWithTwoMembers.fs (4,35--4,40)),
                                None, Ident allowInto,
-                               /root/ObjectModelWithTwoMembers.fs (4,35--4,40),
+                               /root/OperatorName/ObjectModelWithTwoMembers.fs (4,35--4,40),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/ObjectModelWithTwoMembers.fs (4,4--4,10)
+                                    /root/OperatorName/ObjectModelWithTwoMembers.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/ObjectModelWithTwoMembers.fs (4,41--4,42) })),
+                                    /root/OperatorName/ObjectModelWithTwoMembers.fs (4,41--4,42) })),
                          Some
                            (SynBinding
                               (None, Normal, false, false, [],
@@ -106,56 +109,64 @@ ImplFile
                                LongIdent
                                  (SynLongIdent
                                     ([_; AllowIntoPattern],
-                                     [/root/ObjectModelWithTwoMembers.fs (4,12--4,13)],
+                                     [/root/OperatorName/ObjectModelWithTwoMembers.fs (4,12--4,13)],
                                      [None; None]), Some set, None,
                                   Pats
                                     [Named
                                        (SynIdent (v, None), false, None,
-                                        /root/ObjectModelWithTwoMembers.fs (4,61--4,62))],
+                                        /root/OperatorName/ObjectModelWithTwoMembers.fs (4,61--4,62))],
                                   None,
-                                  /root/ObjectModelWithTwoMembers.fs (4,57--4,62)),
+                                  /root/OperatorName/ObjectModelWithTwoMembers.fs (4,57--4,62)),
                                None,
                                LongIdentSet
                                  (SynLongIdent ([allowInto], [], [None]),
                                   Ident v,
-                                  /root/ObjectModelWithTwoMembers.fs (4,65--4,79)),
-                               /root/ObjectModelWithTwoMembers.fs (4,57--4,62),
+                                  /root/OperatorName/ObjectModelWithTwoMembers.fs (4,65--4,79)),
+                               /root/OperatorName/ObjectModelWithTwoMembers.fs (4,57--4,62),
                                NoneAtInvisible,
                                { LeadingKeyword =
                                   Member
-                                    /root/ObjectModelWithTwoMembers.fs (4,4--4,10)
+                                    /root/OperatorName/ObjectModelWithTwoMembers.fs (4,4--4,10)
                                  InlineKeyword = None
                                  EqualsRange =
                                   Some
-                                    /root/ObjectModelWithTwoMembers.fs (4,63--4,64) })),
-                         /root/ObjectModelWithTwoMembers.fs (4,4--4,79),
+                                    /root/OperatorName/ObjectModelWithTwoMembers.fs (4,63--4,64) })),
+                         /root/OperatorName/ObjectModelWithTwoMembers.fs (4,4--4,79),
                          { InlineKeyword = None
                            WithKeyword =
-                            /root/ObjectModelWithTwoMembers.fs (4,30--4,34)
+                            /root/OperatorName/ObjectModelWithTwoMembers.fs (4,30--4,34)
                            GetKeyword =
-                            Some /root/ObjectModelWithTwoMembers.fs (4,35--4,38)
+                            Some
+                              /root/OperatorName/ObjectModelWithTwoMembers.fs (4,35--4,38)
                            AndKeyword =
-                            Some /root/ObjectModelWithTwoMembers.fs (4,53--4,56)
+                            Some
+                              /root/OperatorName/ObjectModelWithTwoMembers.fs (4,53--4,56)
                            SetKeyword =
-                            Some /root/ObjectModelWithTwoMembers.fs (4,57--4,60) })],
-                     /root/ObjectModelWithTwoMembers.fs (3,4--4,79)), [],
+                            Some
+                              /root/OperatorName/ObjectModelWithTwoMembers.fs (4,57--4,60) })],
+                     /root/OperatorName/ObjectModelWithTwoMembers.fs (3,4--4,79)),
+                  [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
-                          ([], /root/ObjectModelWithTwoMembers.fs (2,6--2,8)),
+                          ([],
+                           /root/OperatorName/ObjectModelWithTwoMembers.fs (2,6--2,8)),
                         None,
                         PreXmlDoc ((2,6), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/ObjectModelWithTwoMembers.fs (2,5--2,6),
+                        /root/OperatorName/ObjectModelWithTwoMembers.fs (2,5--2,6),
                         { AsKeyword = None })),
-                  /root/ObjectModelWithTwoMembers.fs (2,5--4,79),
+                  /root/OperatorName/ObjectModelWithTwoMembers.fs (2,5--4,79),
                   { LeadingKeyword =
-                     Type /root/ObjectModelWithTwoMembers.fs (2,0--2,4)
+                     Type
+                       /root/OperatorName/ObjectModelWithTwoMembers.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/ObjectModelWithTwoMembers.fs (2,9--2,10)
+                     Some
+                       /root/OperatorName/ObjectModelWithTwoMembers.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/ObjectModelWithTwoMembers.fs (2,0--4,79))], PreXmlDocEmpty,
-          [], None, /root/ObjectModelWithTwoMembers.fs (2,0--5,0),
+              /root/OperatorName/ObjectModelWithTwoMembers.fs (2,0--4,79))],
+          PreXmlDocEmpty, [], None,
+          /root/OperatorName/ObjectModelWithTwoMembers.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorAsFunction.fs b/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/OperatorAsFunction.fs
rename to tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs
diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl
new file mode 100644
index 00000000000..aa3011f62b2
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl
@@ -0,0 +1,34 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorName/OperatorAsFunction.fs", false,
+      QualifiedNameOfFile OperatorAsFunction, [], [],
+      [SynModuleOrNamespace
+         ([OperatorAsFunction], false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false,
+                 App
+                   (NonAtomic, false,
+                    LongIdent
+                      (false,
+                       SynLongIdent
+                         ([op_Addition], [],
+                          [Some
+                             (OriginalNotationWithParen
+                                (/root/OperatorName/OperatorAsFunction.fs (2,0--2,1),
+                                 "+",
+                                 /root/OperatorName/OperatorAsFunction.fs (2,2--2,3)))]),
+                       None, /root/OperatorName/OperatorAsFunction.fs (2,0--2,3)),
+                    Const
+                      (Int32 3,
+                       /root/OperatorName/OperatorAsFunction.fs (2,4--2,5)),
+                    /root/OperatorName/OperatorAsFunction.fs (2,0--2,5)),
+                 Const
+                   (Int32 4, /root/OperatorName/OperatorAsFunction.fs (2,6--2,7)),
+                 /root/OperatorName/OperatorAsFunction.fs (2,0--2,7)),
+              /root/OperatorName/OperatorAsFunction.fs (2,0--2,7))],
+          PreXmlDocEmpty, [], None,
+          /root/OperatorName/OperatorAsFunction.fs (2,0--2,7),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs b/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs
rename to tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs
diff --git a/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl
similarity index 60%
rename from tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs.bsl
rename to tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl
index 97536705a76..2d770aede1b 100644
--- a/tests/service/data/SyntaxTree/OperatorInMemberDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/OperatorInMemberDefinition.fs", false,
+     ("/root/OperatorName/OperatorInMemberDefinition.fs", false,
       QualifiedNameOfFile OperatorInMemberDefinition, [], [],
       [SynModuleOrNamespace
          ([OperatorInMemberDefinition], false, AnonModule,
@@ -9,11 +9,13 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/OperatorInMemberDefinition.fs (2,5--2,6)),
+                     false, None,
+                     /root/OperatorName/OperatorInMemberDefinition.fs (2,5--2,6)),
                   ObjectModel
                     (Augmentation
-                       /root/OperatorInMemberDefinition.fs (2,7--2,11), [],
-                     /root/OperatorInMemberDefinition.fs (2,5--3,28)),
+                       /root/OperatorName/OperatorInMemberDefinition.fs (2,7--2,11),
+                     [],
+                     /root/OperatorName/OperatorInMemberDefinition.fs (2,5--3,28)),
                   [Member
                      (SynBinding
                         (None, Normal, false, false, [],
@@ -33,23 +35,23 @@ ImplFile
                          LongIdent
                            (SynLongIdent
                               ([_; op_Addition],
-                               [/root/OperatorInMemberDefinition.fs (3,12--3,13)],
+                               [/root/OperatorName/OperatorInMemberDefinition.fs (3,12--3,13)],
                                [None;
                                 Some
                                   (OriginalNotationWithParen
-                                     (/root/OperatorInMemberDefinition.fs (3,13--3,14),
+                                     (/root/OperatorName/OperatorInMemberDefinition.fs (3,13--3,14),
                                       "+",
-                                      /root/OperatorInMemberDefinition.fs (3,15--3,16)))]),
+                                      /root/OperatorName/OperatorInMemberDefinition.fs (3,15--3,16)))]),
                             None, None,
                             Pats
                               [Named
                                  (SynIdent (a, None), false, None,
-                                  /root/OperatorInMemberDefinition.fs (3,17--3,18));
+                                  /root/OperatorName/OperatorInMemberDefinition.fs (3,17--3,18));
                                Named
                                  (SynIdent (b, None), false, None,
-                                  /root/OperatorInMemberDefinition.fs (3,19--3,20))],
+                                  /root/OperatorName/OperatorInMemberDefinition.fs (3,19--3,20))],
                             None,
-                            /root/OperatorInMemberDefinition.fs (3,11--3,20)),
+                            /root/OperatorName/OperatorInMemberDefinition.fs (3,11--3,20)),
                          None,
                          App
                            (NonAtomic, false,
@@ -60,28 +62,31 @@ ImplFile
                                   SynLongIdent
                                     ([op_Addition], [],
                                      [Some (OriginalNotation "+")]), None,
-                                  /root/OperatorInMemberDefinition.fs (3,25--3,26)),
+                                  /root/OperatorName/OperatorInMemberDefinition.fs (3,25--3,26)),
                                Ident a,
-                               /root/OperatorInMemberDefinition.fs (3,23--3,26)),
+                               /root/OperatorName/OperatorInMemberDefinition.fs (3,23--3,26)),
                             Ident b,
-                            /root/OperatorInMemberDefinition.fs (3,23--3,28)),
-                         /root/OperatorInMemberDefinition.fs (3,11--3,20),
+                            /root/OperatorName/OperatorInMemberDefinition.fs (3,23--3,28)),
+                         /root/OperatorName/OperatorInMemberDefinition.fs (3,11--3,20),
                          NoneAtInvisible,
                          { LeadingKeyword =
                             Member
-                              /root/OperatorInMemberDefinition.fs (3,4--3,10)
+                              /root/OperatorName/OperatorInMemberDefinition.fs (3,4--3,10)
                            InlineKeyword = None
                            EqualsRange =
                             Some
-                              /root/OperatorInMemberDefinition.fs (3,21--3,22) }),
-                      /root/OperatorInMemberDefinition.fs (3,4--3,28))], None,
-                  /root/OperatorInMemberDefinition.fs (2,5--3,28),
+                              /root/OperatorName/OperatorInMemberDefinition.fs (3,21--3,22) }),
+                      /root/OperatorName/OperatorInMemberDefinition.fs (3,4--3,28))],
+                  None,
+                  /root/OperatorName/OperatorInMemberDefinition.fs (2,5--3,28),
                   { LeadingKeyword =
-                     Type /root/OperatorInMemberDefinition.fs (2,0--2,4)
+                     Type
+                       /root/OperatorName/OperatorInMemberDefinition.fs (2,0--2,4)
                     EqualsRange = None
                     WithKeyword = None })],
-              /root/OperatorInMemberDefinition.fs (2,0--3,28))], PreXmlDocEmpty,
-          [], None, /root/OperatorInMemberDefinition.fs (2,0--4,0),
+              /root/OperatorName/OperatorInMemberDefinition.fs (2,0--3,28))],
+          PreXmlDocEmpty, [], None,
+          /root/OperatorName/OperatorInMemberDefinition.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi
rename to tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi
diff --git a/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi.bsl
rename to tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl
index ed2b0063b7d..4b42fe47a04 100644
--- a/tests/service/data/SyntaxTree/OperatorNameInSynValSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/OperatorNameInSynValSig.fsi",
+     ("/root/OperatorName/OperatorNameInSynValSig.fsi",
       QualifiedNameOfFile IntrinsicOperators, [], [],
       [SynModuleOrNamespaceSig
          ([IntrinsicOperators], false, NamedModule,
@@ -11,40 +11,44 @@ SigFile
                    (op_Amp,
                     Some
                       (OriginalNotationWithParen
-                         (/root/OperatorNameInSynValSig.fsi (3,4--3,5), "&",
-                          /root/OperatorNameInSynValSig.fsi (3,6--3,7)))),
+                         (/root/OperatorName/OperatorNameInSynValSig.fsi (3,4--3,5),
+                          "&",
+                          /root/OperatorName/OperatorNameInSynValSig.fsi (3,6--3,7)))),
                  SynValTyparDecls (None, true),
                  Fun
                    (SignatureParameter
                       ([], false, Some e1,
                        LongIdent (SynLongIdent ([bool], [], [None])),
-                       /root/OperatorNameInSynValSig.fsi (3,9--3,17)),
+                       /root/OperatorName/OperatorNameInSynValSig.fsi (3,9--3,17)),
                     Fun
                       (SignatureParameter
                          ([], false, Some e2,
                           LongIdent (SynLongIdent ([bool], [], [None])),
-                          /root/OperatorNameInSynValSig.fsi (3,21--3,29)),
+                          /root/OperatorName/OperatorNameInSynValSig.fsi (3,21--3,29)),
                        LongIdent (SynLongIdent ([bool], [], [None])),
-                       /root/OperatorNameInSynValSig.fsi (3,21--3,37),
+                       /root/OperatorName/OperatorNameInSynValSig.fsi (3,21--3,37),
                        { ArrowRange =
-                          /root/OperatorNameInSynValSig.fsi (3,30--3,32) }),
-                    /root/OperatorNameInSynValSig.fsi (3,9--3,37),
+                          /root/OperatorName/OperatorNameInSynValSig.fsi (3,30--3,32) }),
+                    /root/OperatorName/OperatorNameInSynValSig.fsi (3,9--3,37),
                     { ArrowRange =
-                       /root/OperatorNameInSynValSig.fsi (3,18--3,20) }),
+                       /root/OperatorName/OperatorNameInSynValSig.fsi (3,18--3,20) }),
                  SynValInfo
                    ([[SynArgInfo ([], false, Some e1)];
                      [SynArgInfo ([], false, Some e2)]],
                     SynArgInfo ([], false, None)), false, false,
                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 None, /root/OperatorNameInSynValSig.fsi (3,0--3,37),
+                 None,
+                 /root/OperatorName/OperatorNameInSynValSig.fsi (3,0--3,37),
                  { LeadingKeyword =
-                    Val /root/OperatorNameInSynValSig.fsi (3,0--3,3)
+                    Val
+                      /root/OperatorName/OperatorNameInSynValSig.fsi (3,0--3,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/OperatorNameInSynValSig.fsi (3,0--3,37))],
+              /root/OperatorName/OperatorNameInSynValSig.fsi (3,0--3,37))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/OperatorNameInSynValSig.fsi (2,0--3,37),
-          { LeadingKeyword = Module /root/OperatorNameInSynValSig.fsi (2,0--2,6) })],
+          /root/OperatorName/OperatorNameInSynValSig.fsi (2,0--3,37),
+          { LeadingKeyword =
+             Module /root/OperatorName/OperatorNameInSynValSig.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi
rename to tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi
diff --git a/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi.bsl
rename to tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl
index 98687f89e3a..c5a896978cd 100644
--- a/tests/service/data/SyntaxTree/OperatorNameInValConstraint.fsi.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl
@@ -1,7 +1,7 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/OperatorNameInValConstraint.fsi", QualifiedNameOfFile Operators, [],
-      [],
+     ("/root/OperatorName/OperatorNameInValConstraint.fsi",
+      QualifiedNameOfFile Operators, [], [],
       [SynModuleOrNamespaceSig
          ([Operators], false, NamedModule,
           [Val
@@ -11,9 +11,9 @@ SigFile
                    (op_UnaryNegation,
                     Some
                       (OriginalNotationWithParen
-                         (/root/OperatorNameInValConstraint.fsi (12,15--12,16),
+                         (/root/OperatorName/OperatorNameInValConstraint.fsi (12,15--12,16),
                           "~-",
-                          /root/OperatorNameInValConstraint.fsi (12,18--12,19)))),
+                          /root/OperatorName/OperatorNameInValConstraint.fsi (12,18--12,19)))),
                  SynValTyparDecls (None, true),
                  WithGlobalConstraints
                    (Fun
@@ -21,18 +21,18 @@ SigFile
                          ([], false, Some n,
                           Var
                             (SynTypar (T, HeadType, false),
-                             /root/OperatorNameInValConstraint.fsi (12,24--12,26)),
-                          /root/OperatorNameInValConstraint.fsi (12,21--12,26)),
+                             /root/OperatorName/OperatorNameInValConstraint.fsi (12,24--12,26)),
+                          /root/OperatorName/OperatorNameInValConstraint.fsi (12,21--12,26)),
                        Var
                          (SynTypar (T, HeadType, false),
-                          /root/OperatorNameInValConstraint.fsi (12,30--12,32)),
-                       /root/OperatorNameInValConstraint.fsi (12,21--12,32),
+                          /root/OperatorName/OperatorNameInValConstraint.fsi (12,30--12,32)),
+                       /root/OperatorName/OperatorNameInValConstraint.fsi (12,21--12,32),
                        { ArrowRange =
-                          /root/OperatorNameInValConstraint.fsi (12,27--12,29) }),
+                          /root/OperatorName/OperatorNameInValConstraint.fsi (12,27--12,29) }),
                     [WhereTyparSupportsMember
                        (Var
                           (SynTypar (T, HeadType, false),
-                           /root/OperatorNameInValConstraint.fsi (12,38--12,40)),
+                           /root/OperatorName/OperatorNameInValConstraint.fsi (12,38--12,40)),
                         Member
                           (SynValSig
                              ([],
@@ -40,30 +40,30 @@ SigFile
                                 (op_UnaryNegation,
                                  Some
                                    (OriginalNotationWithParen
-                                      (/root/OperatorNameInValConstraint.fsi (12,57--12,58),
+                                      (/root/OperatorName/OperatorNameInValConstraint.fsi (12,57--12,58),
                                        "~-",
-                                       /root/OperatorNameInValConstraint.fsi (12,62--12,63)))),
+                                       /root/OperatorName/OperatorNameInValConstraint.fsi (12,62--12,63)))),
                               SynValTyparDecls (None, true),
                               Fun
                                 (Var
                                    (SynTypar (T, HeadType, false),
-                                    /root/OperatorNameInValConstraint.fsi (12,65--12,67)),
+                                    /root/OperatorName/OperatorNameInValConstraint.fsi (12,65--12,67)),
                                  Var
                                    (SynTypar (T, HeadType, false),
-                                    /root/OperatorNameInValConstraint.fsi (12,71--12,73)),
-                                 /root/OperatorNameInValConstraint.fsi (12,65--12,73),
+                                    /root/OperatorName/OperatorNameInValConstraint.fsi (12,71--12,73)),
+                                 /root/OperatorName/OperatorNameInValConstraint.fsi (12,65--12,73),
                                  { ArrowRange =
-                                    /root/OperatorNameInValConstraint.fsi (12,68--12,70) }),
+                                    /root/OperatorName/OperatorNameInValConstraint.fsi (12,68--12,70) }),
                               SynValInfo
                                 ([[SynArgInfo ([], false, None)]],
                                  SynArgInfo ([], false, None)), false, false,
                               PreXmlDoc ((12,43), FSharp.Compiler.Xml.XmlDocCollector),
                               None, None,
-                              /root/OperatorNameInValConstraint.fsi (12,43--12,73),
+                              /root/OperatorName/OperatorNameInValConstraint.fsi (12,43--12,73),
                               { LeadingKeyword =
                                  StaticMember
-                                   (/root/OperatorNameInValConstraint.fsi (12,43--12,49),
-                                    /root/OperatorNameInValConstraint.fsi (12,50--12,56))
+                                   (/root/OperatorName/OperatorNameInValConstraint.fsi (12,43--12,49),
+                                    /root/OperatorName/OperatorNameInValConstraint.fsi (12,50--12,56))
                                 InlineKeyword = None
                                 WithKeyword = None
                                 EqualsRange = None }),
@@ -73,38 +73,45 @@ SigFile
                              IsFinal = false
                              GetterOrSetterIsCompilerGenerated = false
                              MemberKind = Member },
-                           /root/OperatorNameInValConstraint.fsi (12,43--12,73),
+                           /root/OperatorName/OperatorNameInValConstraint.fsi (12,43--12,73),
                            { GetSetKeywords = None }),
-                        /root/OperatorNameInValConstraint.fsi (12,38--12,74));
+                        /root/OperatorName/OperatorNameInValConstraint.fsi (12,38--12,74));
                      WhereTyparDefaultsToType
                        (SynTypar (T, HeadType, false),
                         LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/OperatorNameInValConstraint.fsi (12,79--12,94))],
-                    /root/OperatorNameInValConstraint.fsi (12,21--12,94)),
+                        /root/OperatorName/OperatorNameInValConstraint.fsi (12,79--12,94))],
+                    /root/OperatorName/OperatorNameInValConstraint.fsi (12,21--12,94)),
                  SynValInfo
                    ([[SynArgInfo ([], false, Some n)]],
                     SynArgInfo ([], false, None)), true, false,
                  PreXmlDoc ((12,4), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 None, /root/OperatorNameInValConstraint.fsi (4,4--12,94),
+                 None,
+                 /root/OperatorName/OperatorNameInValConstraint.fsi (4,4--12,94),
                  { LeadingKeyword =
-                    Val /root/OperatorNameInValConstraint.fsi (12,4--12,7)
+                    Val
+                      /root/OperatorName/OperatorNameInValConstraint.fsi (12,4--12,7)
                    InlineKeyword =
-                    Some /root/OperatorNameInValConstraint.fsi (12,8--12,14)
+                    Some
+                      /root/OperatorName/OperatorNameInValConstraint.fsi (12,8--12,14)
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/OperatorNameInValConstraint.fsi (4,4--12,94))],
+              /root/OperatorName/OperatorNameInValConstraint.fsi (4,4--12,94))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
           [{ Attributes =
               [{ TypeName = SynLongIdent ([AutoOpen], [], [None])
                  ArgExpr =
                   Const
-                    (Unit, /root/OperatorNameInValConstraint.fsi (2,2--2,10))
+                    (Unit,
+                     /root/OperatorName/OperatorNameInValConstraint.fsi (2,2--2,10))
                  Target = None
                  AppliesToGetterAndSetter = false
-                 Range = /root/OperatorNameInValConstraint.fsi (2,2--2,10) }]
-             Range = /root/OperatorNameInValConstraint.fsi (2,0--2,12) }], None,
-          /root/OperatorNameInValConstraint.fsi (2,0--12,94),
+                 Range =
+                  /root/OperatorName/OperatorNameInValConstraint.fsi (2,2--2,10) }]
+             Range =
+              /root/OperatorName/OperatorNameInValConstraint.fsi (2,0--2,12) }],
+          None, /root/OperatorName/OperatorNameInValConstraint.fsi (2,0--12,94),
           { LeadingKeyword =
-             Module /root/OperatorNameInValConstraint.fsi (3,4--3,10) })],
+             Module
+               /root/OperatorName/OperatorNameInValConstraint.fsi (3,4--3,10) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OptionalExpression.fs b/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/OptionalExpression.fs
rename to tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs
diff --git a/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl
new file mode 100644
index 00000000000..ba569c77281
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl
@@ -0,0 +1,38 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorName/OptionalExpression.fs", false,
+      QualifiedNameOfFile OptionalExpression, [], [],
+      [SynModuleOrNamespace
+         ([OptionalExpression], false, AnonModule,
+          [Expr
+             (App
+                (Atomic, false, Ident f,
+                 Paren
+                   (App
+                      (NonAtomic, false,
+                       App
+                         (NonAtomic, true,
+                          LongIdent
+                            (false,
+                             SynLongIdent
+                               ([op_Equality], [], [Some (OriginalNotation "=")]),
+                             None,
+                             /root/OperatorName/OptionalExpression.fs (2,5--2,6)),
+                          LongIdent
+                            (true, SynLongIdent ([x], [], [None]), None,
+                             /root/OperatorName/OptionalExpression.fs (2,3--2,4)),
+                          /root/OperatorName/OptionalExpression.fs (2,3--2,6)),
+                       Const
+                         (Int32 7,
+                          /root/OperatorName/OptionalExpression.fs (2,7--2,8)),
+                       /root/OperatorName/OptionalExpression.fs (2,3--2,8)),
+                    /root/OperatorName/OptionalExpression.fs (2,1--2,2),
+                    Some /root/OperatorName/OptionalExpression.fs (2,8--2,9),
+                    /root/OperatorName/OptionalExpression.fs (2,1--2,9)),
+                 /root/OperatorName/OptionalExpression.fs (2,0--2,9)),
+              /root/OperatorName/OptionalExpression.fs (2,0--2,9))],
+          PreXmlDocEmpty, [], None,
+          /root/OperatorName/OptionalExpression.fs (2,0--2,9),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs
rename to tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs
diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl
new file mode 100644
index 00000000000..a595de36632
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl
@@ -0,0 +1,29 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorName/PartialActivePatternAsFunction.fs", false,
+      QualifiedNameOfFile PartialActivePatternAsFunction, [], [],
+      [SynModuleOrNamespace
+         ([PartialActivePatternAsFunction], false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false,
+                 LongIdent
+                   (false,
+                    SynLongIdent
+                      ([|Odd|_|], [],
+                       [Some
+                          (HasParenthesis
+                             (/root/OperatorName/PartialActivePatternAsFunction.fs (2,0--2,1),
+                              /root/OperatorName/PartialActivePatternAsFunction.fs (2,8--2,9)))]),
+                    None,
+                    /root/OperatorName/PartialActivePatternAsFunction.fs (2,0--2,9)),
+                 Const
+                   (Int32 4,
+                    /root/OperatorName/PartialActivePatternAsFunction.fs (2,10--2,11)),
+                 /root/OperatorName/PartialActivePatternAsFunction.fs (2,0--2,11)),
+              /root/OperatorName/PartialActivePatternAsFunction.fs (2,0--2,11))],
+          PreXmlDocEmpty, [], None,
+          /root/OperatorName/PartialActivePatternAsFunction.fs (2,0--2,11),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs
rename to tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs
diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl
new file mode 100644
index 00000000000..3cd5076f730
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl
@@ -0,0 +1,93 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorName/PartialActivePatternDefinition.fs", false,
+      QualifiedNameOfFile PartialActivePatternDefinition, [], [],
+      [SynModuleOrNamespace
+         ([PartialActivePatternDefinition], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None,
+                     SynValInfo
+                       ([[SynArgInfo ([], false, Some a)]],
+                        SynArgInfo ([], false, None)), None),
+                  LongIdent
+                    (SynLongIdent
+                       ([|Int32Const|_|], [],
+                        [Some
+                           (HasParenthesis
+                              (/root/OperatorName/PartialActivePatternDefinition.fs (2,4--2,5),
+                               /root/OperatorName/PartialActivePatternDefinition.fs (2,19--2,20)))]),
+                     None, None,
+                     Pats
+                       [Paren
+                          (Typed
+                             (Named
+                                (SynIdent (a, None), false, None,
+                                 /root/OperatorName/PartialActivePatternDefinition.fs (2,22--2,23)),
+                              LongIdent (SynLongIdent ([SynConst], [], [None])),
+                              /root/OperatorName/PartialActivePatternDefinition.fs (2,22--2,33)),
+                           /root/OperatorName/PartialActivePatternDefinition.fs (2,21--2,34))],
+                     None,
+                     /root/OperatorName/PartialActivePatternDefinition.fs (2,4--2,34)),
+                  None,
+                  Match
+                    (Yes
+                       /root/OperatorName/PartialActivePatternDefinition.fs (2,37--2,49),
+                     Ident a,
+                     [SynMatchClause
+                        (LongIdent
+                           (SynLongIdent
+                              ([SynConst; Int32],
+                               [/root/OperatorName/PartialActivePatternDefinition.fs (2,58--2,59)],
+                               [None; None]), None, None,
+                            Pats
+                              [Wild
+                                 /root/OperatorName/PartialActivePatternDefinition.fs (2,65--2,66)],
+                            None,
+                            /root/OperatorName/PartialActivePatternDefinition.fs (2,50--2,66)),
+                         None,
+                         App
+                           (NonAtomic, false, Ident Some, Ident a,
+                            /root/OperatorName/PartialActivePatternDefinition.fs (2,70--2,76)),
+                         /root/OperatorName/PartialActivePatternDefinition.fs (2,50--2,76),
+                         Yes,
+                         { ArrowRange =
+                            Some
+                              /root/OperatorName/PartialActivePatternDefinition.fs (2,67--2,69)
+                           BarRange = None });
+                      SynMatchClause
+                        (Wild
+                           /root/OperatorName/PartialActivePatternDefinition.fs (2,79--2,80),
+                         None, Ident None,
+                         /root/OperatorName/PartialActivePatternDefinition.fs (2,79--2,88),
+                         Yes,
+                         { ArrowRange =
+                            Some
+                              /root/OperatorName/PartialActivePatternDefinition.fs (2,81--2,83)
+                           BarRange =
+                            Some
+                              /root/OperatorName/PartialActivePatternDefinition.fs (2,77--2,78) })],
+                     /root/OperatorName/PartialActivePatternDefinition.fs (2,37--2,88),
+                     { MatchKeyword =
+                        /root/OperatorName/PartialActivePatternDefinition.fs (2,37--2,42)
+                       WithKeyword =
+                        /root/OperatorName/PartialActivePatternDefinition.fs (2,45--2,49) }),
+                  /root/OperatorName/PartialActivePatternDefinition.fs (2,4--2,34),
+                  NoneAtLet,
+                  { LeadingKeyword =
+                     Let
+                       /root/OperatorName/PartialActivePatternDefinition.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/OperatorName/PartialActivePatternDefinition.fs (2,35--2,36) })],
+              /root/OperatorName/PartialActivePatternDefinition.fs (2,0--2,88))],
+          PreXmlDocEmpty, [], None,
+          /root/OperatorName/PartialActivePatternDefinition.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs
rename to tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs
diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl
new file mode 100644
index 00000000000..0667cbcde19
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl
@@ -0,0 +1,47 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs",
+      false, QualifiedNameOfFile PartialActivePatternDefinitionWithoutParameters,
+      [], [],
+      [SynModuleOrNamespace
+         ([PartialActivePatternDefinitionWithoutParameters], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named
+                    (SynIdent
+                       (|Boolean|_|,
+                        Some
+                          (HasParenthesis
+                             (/root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs (2,4--2,5),
+                              /root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs (2,16--2,17)))),
+                     false, None,
+                     /root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs (2,5--2,16)),
+                  None,
+                  LongIdent
+                    (false,
+                     SynLongIdent
+                       ([Boolean; parse],
+                        [/root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs (2,27--2,28)],
+                        [None; None]), None,
+                     /root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs (2,20--2,33)),
+                  /root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs (2,4--2,17),
+                  Yes
+                    /root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs (2,0--2,33),
+                  { LeadingKeyword =
+                     Let
+                       /root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs (2,18--2,19) })],
+              /root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs (2,0--2,33))],
+          PreXmlDocEmpty, [], None,
+          /root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrefixOperation.fs b/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/PrefixOperation.fs
rename to tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs
diff --git a/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl
new file mode 100644
index 00000000000..a471d0c9c83
--- /dev/null
+++ b/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl
@@ -0,0 +1,22 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/OperatorName/PrefixOperation.fs", false,
+      QualifiedNameOfFile PrefixOperation, [], [],
+      [SynModuleOrNamespace
+         ([PrefixOperation], false, AnonModule,
+          [Expr
+             (App
+                (NonAtomic, false,
+                 LongIdent
+                   (false,
+                    SynLongIdent
+                      ([op_UnaryPlus], [], [Some (OriginalNotation "+")]), None,
+                    /root/OperatorName/PrefixOperation.fs (2,0--2,1)),
+                 Const
+                   (Int32 -86, /root/OperatorName/PrefixOperation.fs (2,2--2,5)),
+                 /root/OperatorName/PrefixOperation.fs (2,0--2,5)),
+              /root/OperatorName/PrefixOperation.fs (2,0--2,5))], PreXmlDocEmpty,
+          [], None, /root/OperatorName/PrefixOperation.fs (2,0--2,5),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs b/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs
rename to tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs
diff --git a/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl
similarity index 56%
rename from tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs.bsl
rename to tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl
index 034e2224953..4c877b7e451 100644
--- a/tests/service/data/SyntaxTree/PrefixOperationWithTwoCharacters.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/PrefixOperationWithTwoCharacters.fs", false,
+     ("/root/OperatorName/PrefixOperationWithTwoCharacters.fs", false,
       QualifiedNameOfFile PrefixOperationWithTwoCharacters, [], [],
       [SynModuleOrNamespace
          ([PrefixOperationWithTwoCharacters], false, AnonModule,
@@ -11,11 +11,13 @@ ImplFile
                    (false,
                     SynLongIdent
                       ([op_SpliceUntyped], [], [Some (OriginalNotation "%%")]),
-                    None, /root/PrefixOperationWithTwoCharacters.fs (2,0--2,2)),
-                 Ident arg, /root/PrefixOperationWithTwoCharacters.fs (2,0--2,5)),
-              /root/PrefixOperationWithTwoCharacters.fs (2,0--2,5))],
+                    None,
+                    /root/OperatorName/PrefixOperationWithTwoCharacters.fs (2,0--2,2)),
+                 Ident arg,
+                 /root/OperatorName/PrefixOperationWithTwoCharacters.fs (2,0--2,5)),
+              /root/OperatorName/PrefixOperationWithTwoCharacters.fs (2,0--2,5))],
           PreXmlDocEmpty, [], None,
-          /root/PrefixOperationWithTwoCharacters.fs (2,0--2,5),
+          /root/OperatorName/PrefixOperationWithTwoCharacters.fs (2,0--2,5),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs b/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs
rename to tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs
diff --git a/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl
similarity index 51%
rename from tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs.bsl
rename to tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl
index 332aec0dd0a..03a6d61d4e3 100644
--- a/tests/service/data/SyntaxTree/QualifiedOperatorExpression.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/QualifiedOperatorExpression.fs", false,
+     ("/root/OperatorName/QualifiedOperatorExpression.fs", false,
       QualifiedNameOfFile QualifiedOperatorExpression, [], [],
       [SynModuleOrNamespace
          ([QualifiedOperatorExpression], false, AnonModule,
@@ -22,14 +22,15 @@ ImplFile
                           (Typed
                              (Named
                                 (SynIdent (x, None), false, None,
-                                 /root/QualifiedOperatorExpression.fs (2,13--2,14)),
+                                 /root/OperatorName/QualifiedOperatorExpression.fs (2,13--2,14)),
                               LongIdent (SynLongIdent ([byte], [], [None])),
-                              /root/QualifiedOperatorExpression.fs (2,13--2,19)),
-                           /root/QualifiedOperatorExpression.fs (2,12--2,20));
+                              /root/OperatorName/QualifiedOperatorExpression.fs (2,13--2,19)),
+                           /root/OperatorName/QualifiedOperatorExpression.fs (2,12--2,20));
                         Named
                           (SynIdent (n, None), false, None,
-                           /root/QualifiedOperatorExpression.fs (2,21--2,22))],
-                     None, /root/QualifiedOperatorExpression.fs (2,4--2,22)),
+                           /root/OperatorName/QualifiedOperatorExpression.fs (2,21--2,22))],
+                     None,
+                     /root/OperatorName/QualifiedOperatorExpression.fs (2,4--2,22)),
                   None,
                   App
                     (NonAtomic, false,
@@ -37,23 +38,29 @@ ImplFile
                        (false,
                         SynLongIdent
                           ([Checked; op_Multiply],
-                           [/root/QualifiedOperatorExpression.fs (2,32--2,33)],
+                           [/root/OperatorName/QualifiedOperatorExpression.fs (2,32--2,33)],
                            [None;
                             Some
                               (OriginalNotationWithParen
-                                 (/root/QualifiedOperatorExpression.fs (2,33--2,34),
+                                 (/root/OperatorName/QualifiedOperatorExpression.fs (2,33--2,34),
                                   "*",
-                                  /root/QualifiedOperatorExpression.fs (2,37--2,38)))]),
-                        None, /root/QualifiedOperatorExpression.fs (2,25--2,38)),
-                     Ident x, /root/QualifiedOperatorExpression.fs (2,25--2,40)),
-                  /root/QualifiedOperatorExpression.fs (2,4--2,22), NoneAtLet,
+                                  /root/OperatorName/QualifiedOperatorExpression.fs (2,37--2,38)))]),
+                        None,
+                        /root/OperatorName/QualifiedOperatorExpression.fs (2,25--2,38)),
+                     Ident x,
+                     /root/OperatorName/QualifiedOperatorExpression.fs (2,25--2,40)),
+                  /root/OperatorName/QualifiedOperatorExpression.fs (2,4--2,22),
+                  NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/QualifiedOperatorExpression.fs (2,0--2,3)
+                     Let
+                       /root/OperatorName/QualifiedOperatorExpression.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
-                     Some /root/QualifiedOperatorExpression.fs (2,23--2,24) })],
-              /root/QualifiedOperatorExpression.fs (2,0--2,40))], PreXmlDocEmpty,
-          [], None, /root/QualifiedOperatorExpression.fs (2,0--3,0),
+                     Some
+                       /root/OperatorName/QualifiedOperatorExpression.fs (2,23--2,24) })],
+              /root/OperatorName/QualifiedOperatorExpression.fs (2,0--2,40))],
+          PreXmlDocEmpty, [], None,
+          /root/OperatorName/QualifiedOperatorExpression.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OptionalExpression.fs.bsl b/tests/service/data/SyntaxTree/OptionalExpression.fs.bsl
deleted file mode 100644
index c5aa6352489..00000000000
--- a/tests/service/data/SyntaxTree/OptionalExpression.fs.bsl
+++ /dev/null
@@ -1,33 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/OptionalExpression.fs", false,
-      QualifiedNameOfFile OptionalExpression, [], [],
-      [SynModuleOrNamespace
-         ([OptionalExpression], false, AnonModule,
-          [Expr
-             (App
-                (Atomic, false, Ident f,
-                 Paren
-                   (App
-                      (NonAtomic, false,
-                       App
-                         (NonAtomic, true,
-                          LongIdent
-                            (false,
-                             SynLongIdent
-                               ([op_Equality], [], [Some (OriginalNotation "=")]),
-                             None, /root/OptionalExpression.fs (2,5--2,6)),
-                          LongIdent
-                            (true, SynLongIdent ([x], [], [None]), None,
-                             /root/OptionalExpression.fs (2,3--2,4)),
-                          /root/OptionalExpression.fs (2,3--2,6)),
-                       Const (Int32 7, /root/OptionalExpression.fs (2,7--2,8)),
-                       /root/OptionalExpression.fs (2,3--2,8)),
-                    /root/OptionalExpression.fs (2,1--2,2),
-                    Some /root/OptionalExpression.fs (2,8--2,9),
-                    /root/OptionalExpression.fs (2,1--2,9)),
-                 /root/OptionalExpression.fs (2,0--2,9)),
-              /root/OptionalExpression.fs (2,0--2,9))], PreXmlDocEmpty, [], None,
-          /root/OptionalExpression.fs (2,0--2,9), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl b/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
deleted file mode 100644
index 0d9a1882617..00000000000
--- a/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
+++ /dev/null
@@ -1,67 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/ParenthesesOfSynArgPatsNamePatPairs.fs", false,
-      QualifiedNameOfFile ParenthesesOfSynArgPatsNamePatPairs, [], [],
-      [SynModuleOrNamespace
-         ([ParenthesesOfSynArgPatsNamePatPairs], false, AnonModule,
-          [Expr
-             (Match
-                (Yes /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--2,15),
-                 Ident data,
-                 [SynMatchClause
-                    (LongIdent
-                       (SynLongIdent ([OnePartData], [], [None]), None, None,
-                        NamePatPairs
-                          ([(part1,
-                             /root/ParenthesesOfSynArgPatsNamePatPairs.fs (4,10--4,11),
-                             Named
-                               (SynIdent (p1, None), false, None,
-                                /root/ParenthesesOfSynArgPatsNamePatPairs.fs (4,12--4,14)))],
-                           /root/ParenthesesOfSynArgPatsNamePatPairs.fs (4,4--5,13),
-                           { ParenRange =
-                              /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,13--5,13) }),
-                        None,
-                        /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,2--5,13)),
-                     None, Ident p1,
-                     /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,2--5,19),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,14--5,16)
-                       BarRange =
-                        Some
-                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,0--3,1) });
-                  SynMatchClause
-                    (Wild
-                       /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,2--6,3),
-                     None,
-                     App
-                       (NonAtomic, false, Ident failwith,
-                        Const
-                          (String
-                             ("todo", Regular,
-                              /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,16--6,22)),
-                           /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,16--6,22)),
-                        /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,7--6,22)),
-                     /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,2--6,22),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,4--6,6)
-                       BarRange =
-                        Some
-                          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (6,0--6,1) })],
-                 /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--6,22),
-                 { MatchKeyword =
-                    /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--2,5)
-                   WithKeyword =
-                    /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,11--2,15) }),
-              /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--6,22))],
-          PreXmlDocEmpty, [], None,
-          /root/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--7,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments =
-         [LineComment /root/ParenthesesOfSynArgPatsNamePatPairs.fs (3,15--3,21);
-          BlockComment /root/ParenthesesOfSynArgPatsNamePatPairs.fs (5,2--5,11)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs b/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs
rename to tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs
diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl
new file mode 100644
index 00000000000..ea32301845a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl
@@ -0,0 +1,17 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs",
+      false, QualifiedNameOfFile RegularStringAsParsedHashDirectiveArgument, [],
+      [],
+      [SynModuleOrNamespace
+         ([RegularStringAsParsedHashDirectiveArgument], false, AnonModule,
+          [HashDirective
+             (ParsedHashDirective
+                ("I", [],
+                 /root/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs (2,0--2,2)),
+              /root/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs (2,0--2,4))],
+          PreXmlDocEmpty, [], None,
+          /root/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs (2,0--2,4),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs b/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs
rename to tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs
diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
new file mode 100644
index 00000000000..7d08832f117
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
@@ -0,0 +1,20 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs",
+      false, QualifiedNameOfFile SourceIdentifierAsParsedHashDirectiveArgument,
+      [], [],
+      [SynModuleOrNamespace
+         ([SourceIdentifierAsParsedHashDirectiveArgument], false, AnonModule,
+          [HashDirective
+             (ParsedHashDirective
+                ("I",
+                 [SourceIdentifier
+                    ("__SOURCE_DIRECTORY__", "C:\root\ParsedHashDirective",
+                     /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,3--2,23))],
+                 /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23)),
+              /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23))],
+          PreXmlDocEmpty, [], None,
+          /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs b/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs
rename to tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs
diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
new file mode 100644
index 00000000000..ebdfc1568e7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
@@ -0,0 +1,17 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs",
+      false, QualifiedNameOfFile TripleQuoteStringAsParsedHashDirectiveArgument,
+      [], [],
+      [SynModuleOrNamespace
+         ([TripleQuoteStringAsParsedHashDirectiveArgument], false, AnonModule,
+          [HashDirective
+             (ParsedHashDirective
+                ("nowarn", [],
+                 /root/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs (2,0--2,7)),
+              /root/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs (2,0--2,9))],
+          PreXmlDocEmpty, [], None,
+          /root/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs (2,0--2,9),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs b/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs
rename to tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs
diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
new file mode 100644
index 00000000000..800ebd9091f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
@@ -0,0 +1,17 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs",
+      false, QualifiedNameOfFile VerbatimStringAsParsedHashDirectiveArgument, [],
+      [],
+      [SynModuleOrNamespace
+         ([VerbatimStringAsParsedHashDirectiveArgument], false, AnonModule,
+          [HashDirective
+             (ParsedHashDirective
+                ("I", [],
+                 /root/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs (2,0--2,2)),
+              /root/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs (2,0--2,4))],
+          PreXmlDocEmpty, [], None,
+          /root/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs (2,0--2,4),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs.bsl
deleted file mode 100644
index c49a6c3a251..00000000000
--- a/tests/service/data/SyntaxTree/PartialActivePatternAsFunction.fs.bsl
+++ /dev/null
@@ -1,28 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/PartialActivePatternAsFunction.fs", false,
-      QualifiedNameOfFile PartialActivePatternAsFunction, [], [],
-      [SynModuleOrNamespace
-         ([PartialActivePatternAsFunction], false, AnonModule,
-          [Expr
-             (App
-                (NonAtomic, false,
-                 LongIdent
-                   (false,
-                    SynLongIdent
-                      ([|Odd|_|], [],
-                       [Some
-                          (HasParenthesis
-                             (/root/PartialActivePatternAsFunction.fs (2,0--2,1),
-                              /root/PartialActivePatternAsFunction.fs (2,8--2,9)))]),
-                    None, /root/PartialActivePatternAsFunction.fs (2,0--2,9)),
-                 Const
-                   (Int32 4,
-                    /root/PartialActivePatternAsFunction.fs (2,10--2,11)),
-                 /root/PartialActivePatternAsFunction.fs (2,0--2,11)),
-              /root/PartialActivePatternAsFunction.fs (2,0--2,11))],
-          PreXmlDocEmpty, [], None,
-          /root/PartialActivePatternAsFunction.fs (2,0--2,11),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs.bsl
deleted file mode 100644
index 6f7a8fe7c8b..00000000000
--- a/tests/service/data/SyntaxTree/PartialActivePatternDefinition.fs.bsl
+++ /dev/null
@@ -1,88 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/PartialActivePatternDefinition.fs", false,
-      QualifiedNameOfFile PartialActivePatternDefinition, [], [],
-      [SynModuleOrNamespace
-         ([PartialActivePatternDefinition], false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None,
-                     SynValInfo
-                       ([[SynArgInfo ([], false, Some a)]],
-                        SynArgInfo ([], false, None)), None),
-                  LongIdent
-                    (SynLongIdent
-                       ([|Int32Const|_|], [],
-                        [Some
-                           (HasParenthesis
-                              (/root/PartialActivePatternDefinition.fs (2,4--2,5),
-                               /root/PartialActivePatternDefinition.fs (2,19--2,20)))]),
-                     None, None,
-                     Pats
-                       [Paren
-                          (Typed
-                             (Named
-                                (SynIdent (a, None), false, None,
-                                 /root/PartialActivePatternDefinition.fs (2,22--2,23)),
-                              LongIdent (SynLongIdent ([SynConst], [], [None])),
-                              /root/PartialActivePatternDefinition.fs (2,22--2,33)),
-                           /root/PartialActivePatternDefinition.fs (2,21--2,34))],
-                     None, /root/PartialActivePatternDefinition.fs (2,4--2,34)),
-                  None,
-                  Match
-                    (Yes /root/PartialActivePatternDefinition.fs (2,37--2,49),
-                     Ident a,
-                     [SynMatchClause
-                        (LongIdent
-                           (SynLongIdent
-                              ([SynConst; Int32],
-                               [/root/PartialActivePatternDefinition.fs (2,58--2,59)],
-                               [None; None]), None, None,
-                            Pats
-                              [Wild
-                                 /root/PartialActivePatternDefinition.fs (2,65--2,66)],
-                            None,
-                            /root/PartialActivePatternDefinition.fs (2,50--2,66)),
-                         None,
-                         App
-                           (NonAtomic, false, Ident Some, Ident a,
-                            /root/PartialActivePatternDefinition.fs (2,70--2,76)),
-                         /root/PartialActivePatternDefinition.fs (2,50--2,76),
-                         Yes,
-                         { ArrowRange =
-                            Some
-                              /root/PartialActivePatternDefinition.fs (2,67--2,69)
-                           BarRange = None });
-                      SynMatchClause
-                        (Wild
-                           /root/PartialActivePatternDefinition.fs (2,79--2,80),
-                         None, Ident None,
-                         /root/PartialActivePatternDefinition.fs (2,79--2,88),
-                         Yes,
-                         { ArrowRange =
-                            Some
-                              /root/PartialActivePatternDefinition.fs (2,81--2,83)
-                           BarRange =
-                            Some
-                              /root/PartialActivePatternDefinition.fs (2,77--2,78) })],
-                     /root/PartialActivePatternDefinition.fs (2,37--2,88),
-                     { MatchKeyword =
-                        /root/PartialActivePatternDefinition.fs (2,37--2,42)
-                       WithKeyword =
-                        /root/PartialActivePatternDefinition.fs (2,45--2,49) }),
-                  /root/PartialActivePatternDefinition.fs (2,4--2,34), NoneAtLet,
-                  { LeadingKeyword =
-                     Let /root/PartialActivePatternDefinition.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some /root/PartialActivePatternDefinition.fs (2,35--2,36) })],
-              /root/PartialActivePatternDefinition.fs (2,0--2,88))],
-          PreXmlDocEmpty, [], None,
-          /root/PartialActivePatternDefinition.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs.bsl b/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs.bsl
deleted file mode 100644
index 9c593706b4e..00000000000
--- a/tests/service/data/SyntaxTree/PartialActivePatternDefinitionWithoutParameters.fs.bsl
+++ /dev/null
@@ -1,47 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/PartialActivePatternDefinitionWithoutParameters.fs", false,
-      QualifiedNameOfFile PartialActivePatternDefinitionWithoutParameters, [],
-      [],
-      [SynModuleOrNamespace
-         ([PartialActivePatternDefinitionWithoutParameters], false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent
-                       (|Boolean|_|,
-                        Some
-                          (HasParenthesis
-                             (/root/PartialActivePatternDefinitionWithoutParameters.fs (2,4--2,5),
-                              /root/PartialActivePatternDefinitionWithoutParameters.fs (2,16--2,17)))),
-                     false, None,
-                     /root/PartialActivePatternDefinitionWithoutParameters.fs (2,5--2,16)),
-                  None,
-                  LongIdent
-                    (false,
-                     SynLongIdent
-                       ([Boolean; parse],
-                        [/root/PartialActivePatternDefinitionWithoutParameters.fs (2,27--2,28)],
-                        [None; None]), None,
-                     /root/PartialActivePatternDefinitionWithoutParameters.fs (2,20--2,33)),
-                  /root/PartialActivePatternDefinitionWithoutParameters.fs (2,4--2,17),
-                  Yes
-                    /root/PartialActivePatternDefinitionWithoutParameters.fs (2,0--2,33),
-                  { LeadingKeyword =
-                     Let
-                       /root/PartialActivePatternDefinitionWithoutParameters.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some
-                       /root/PartialActivePatternDefinitionWithoutParameters.fs (2,18--2,19) })],
-              /root/PartialActivePatternDefinitionWithoutParameters.fs (2,0--2,33))],
-          PreXmlDocEmpty, [], None,
-          /root/PartialActivePatternDefinitionWithoutParameters.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InHeadPattern.fs b/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/InHeadPattern.fs
rename to tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs
diff --git a/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl b/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl
new file mode 100644
index 00000000000..97081903f24
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl
@@ -0,0 +1,48 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Pattern/InHeadPattern.fs", false, QualifiedNameOfFile InHeadPattern,
+      [], [],
+      [SynModuleOrNamespace
+         ([InHeadPattern], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  ListCons
+                    (Const (Int32 1, /root/Pattern/InHeadPattern.fs (2,4--2,5)),
+                     Wild /root/Pattern/InHeadPattern.fs (2,9--2,10),
+                     /root/Pattern/InHeadPattern.fs (2,4--2,10),
+                     { ColonColonRange =
+                        /root/Pattern/InHeadPattern.fs (2,6--2,8) }), None,
+                  ArrayOrListComputed
+                    (false,
+                     Sequential
+                       (SuppressNeither, true,
+                        Const
+                          (Int32 4, /root/Pattern/InHeadPattern.fs (2,15--2,16)),
+                        Sequential
+                          (SuppressNeither, true,
+                           Const
+                             (Int32 5,
+                              /root/Pattern/InHeadPattern.fs (2,18--2,19)),
+                           Const
+                             (Int32 6,
+                              /root/Pattern/InHeadPattern.fs (2,21--2,22)),
+                           /root/Pattern/InHeadPattern.fs (2,18--2,22)),
+                        /root/Pattern/InHeadPattern.fs (2,15--2,22)),
+                     /root/Pattern/InHeadPattern.fs (2,13--2,24)),
+                  /root/Pattern/InHeadPattern.fs (2,4--2,10),
+                  Yes /root/Pattern/InHeadPattern.fs (2,0--2,24),
+                  { LeadingKeyword =
+                     Let /root/Pattern/InHeadPattern.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some /root/Pattern/InHeadPattern.fs (2,11--2,12) })],
+              /root/Pattern/InHeadPattern.fs (2,0--2,24))], PreXmlDocEmpty, [],
+          None, /root/Pattern/InHeadPattern.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInMatchPattern.fs b/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/OperatorInMatchPattern.fs
rename to tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs
diff --git a/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl b/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl
new file mode 100644
index 00000000000..7d37c5ab90c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl
@@ -0,0 +1,46 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Pattern/OperatorInMatchPattern.fs", false,
+      QualifiedNameOfFile OperatorInMatchPattern, [], [],
+      [SynModuleOrNamespace
+         ([OperatorInMatchPattern], false, AnonModule,
+          [Expr
+             (Match
+                (Yes /root/Pattern/OperatorInMatchPattern.fs (2,0--2,12),
+                 Ident x,
+                 [SynMatchClause
+                    (ListCons
+                       (Paren
+                          (Named
+                             (SynIdent (head, None), false, None,
+                              /root/Pattern/OperatorInMatchPattern.fs (3,3--3,7)),
+                           /root/Pattern/OperatorInMatchPattern.fs (3,2--3,8)),
+                        Paren
+                          (Named
+                             (SynIdent (tail, None), false, None,
+                              /root/Pattern/OperatorInMatchPattern.fs (3,13--3,17)),
+                           /root/Pattern/OperatorInMatchPattern.fs (3,12--3,18)),
+                        /root/Pattern/OperatorInMatchPattern.fs (3,2--3,18),
+                        { ColonColonRange =
+                           /root/Pattern/OperatorInMatchPattern.fs (3,9--3,11) }),
+                     None,
+                     Const
+                       (Unit,
+                        /root/Pattern/OperatorInMatchPattern.fs (3,22--3,24)),
+                     /root/Pattern/OperatorInMatchPattern.fs (3,2--3,24), Yes,
+                     { ArrowRange =
+                        Some
+                          /root/Pattern/OperatorInMatchPattern.fs (3,19--3,21)
+                       BarRange =
+                        Some /root/Pattern/OperatorInMatchPattern.fs (3,0--3,1) })],
+                 /root/Pattern/OperatorInMatchPattern.fs (2,0--3,24),
+                 { MatchKeyword =
+                    /root/Pattern/OperatorInMatchPattern.fs (2,0--2,5)
+                   WithKeyword =
+                    /root/Pattern/OperatorInMatchPattern.fs (2,8--2,12) }),
+              /root/Pattern/OperatorInMatchPattern.fs (2,0--3,24))],
+          PreXmlDocEmpty, [], None,
+          /root/Pattern/OperatorInMatchPattern.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs b/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/OperatorInSynPatLongIdent.fs
rename to tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs
diff --git a/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl b/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl
new file mode 100644
index 00000000000..72443700ca5
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl
@@ -0,0 +1,58 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Pattern/OperatorInSynPatLongIdent.fs", false,
+      QualifiedNameOfFile OperatorInSynPatLongIdent, [], [],
+      [SynModuleOrNamespace
+         ([OperatorInSynPatLongIdent], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Paren
+                    (ListCons
+                       (Named
+                          (SynIdent (head, None), false, None,
+                           /root/Pattern/OperatorInSynPatLongIdent.fs (2,5--2,9)),
+                        Named
+                          (SynIdent (tail, None), false, None,
+                           /root/Pattern/OperatorInSynPatLongIdent.fs (2,11--2,15)),
+                        /root/Pattern/OperatorInSynPatLongIdent.fs (2,5--2,15),
+                        { ColonColonRange =
+                           /root/Pattern/OperatorInSynPatLongIdent.fs (2,9--2,11) }),
+                     /root/Pattern/OperatorInSynPatLongIdent.fs (2,4--2,16)),
+                  None,
+                  ArrayOrListComputed
+                    (false,
+                     Sequential
+                       (SuppressNeither, true,
+                        Const
+                          (Int32 1,
+                           /root/Pattern/OperatorInSynPatLongIdent.fs (2,22--2,23)),
+                        Sequential
+                          (SuppressNeither, true,
+                           Const
+                             (Int32 2,
+                              /root/Pattern/OperatorInSynPatLongIdent.fs (2,24--2,25)),
+                           Const
+                             (Int32 4,
+                              /root/Pattern/OperatorInSynPatLongIdent.fs (2,26--2,27)),
+                           /root/Pattern/OperatorInSynPatLongIdent.fs (2,24--2,27)),
+                        /root/Pattern/OperatorInSynPatLongIdent.fs (2,22--2,27)),
+                     /root/Pattern/OperatorInSynPatLongIdent.fs (2,20--2,28)),
+                  /root/Pattern/OperatorInSynPatLongIdent.fs (2,4--2,16),
+                  Yes /root/Pattern/OperatorInSynPatLongIdent.fs (2,0--2,28),
+                  { LeadingKeyword =
+                     Let /root/Pattern/OperatorInSynPatLongIdent.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/Pattern/OperatorInSynPatLongIdent.fs (2,17--2,18) })],
+              /root/Pattern/OperatorInSynPatLongIdent.fs (2,0--2,28))],
+          PreXmlDocEmpty, [], None,
+          /root/Pattern/OperatorInSynPatLongIdent.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs b/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/ParenthesesOfSynArgPatsNamePatPairs.fs
rename to tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs
diff --git a/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl b/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
new file mode 100644
index 00000000000..5dbb209f87f
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
@@ -0,0 +1,70 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs", false,
+      QualifiedNameOfFile ParenthesesOfSynArgPatsNamePatPairs, [], [],
+      [SynModuleOrNamespace
+         ([ParenthesesOfSynArgPatsNamePatPairs], false, AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--2,15),
+                 Ident data,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([OnePartData], [], [None]), None, None,
+                        NamePatPairs
+                          ([(part1,
+                             /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (4,10--4,11),
+                             Named
+                               (SynIdent (p1, None), false, None,
+                                /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (4,12--4,14)))],
+                           /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (4,4--5,13),
+                           { ParenRange =
+                              /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (3,13--5,13) }),
+                        None,
+                        /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (3,2--5,13)),
+                     None, Ident p1,
+                     /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (3,2--5,19),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (5,14--5,16)
+                       BarRange =
+                        Some
+                          /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (3,0--3,1) });
+                  SynMatchClause
+                    (Wild
+                       /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (6,2--6,3),
+                     None,
+                     App
+                       (NonAtomic, false, Ident failwith,
+                        Const
+                          (String
+                             ("todo", Regular,
+                              /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (6,16--6,22)),
+                           /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (6,16--6,22)),
+                        /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (6,7--6,22)),
+                     /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (6,2--6,22),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (6,4--6,6)
+                       BarRange =
+                        Some
+                          /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (6,0--6,1) })],
+                 /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--6,22),
+                 { MatchKeyword =
+                    /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--2,5)
+                   WithKeyword =
+                    /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (2,11--2,15) }),
+              /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--6,22))],
+          PreXmlDocEmpty, [], None,
+          /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (2,0--7,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (3,15--3,21);
+          BlockComment
+            /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (5,2--5,11)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs
rename to tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs
diff --git a/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..4e6429ae801
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,48 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs",
+      false,
+      QualifiedNameOfFile SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign], false,
+          AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--2,12),
+                 Ident x,
+                 [SynMatchClause
+                    (LongIdent
+                       (SynLongIdent ([X], [], [None]), None, None,
+                        NamePatPairs
+                          ([(Y,
+                             /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,7--3,8),
+                             Named
+                               (SynIdent (y, None), false, None,
+                                /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,9--3,10)))],
+                           /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,4--3,11),
+                           { ParenRange =
+                              /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,3--3,11) }),
+                        None,
+                        /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,2--3,11)),
+                     None, Ident y,
+                     /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,2--3,16),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,12--3,14)
+                       BarRange =
+                        Some
+                          /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,0--3,1) })],
+                 /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--3,16),
+                 { MatchKeyword =
+                    /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--2,5)
+                   WithKeyword =
+                    /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,8--2,12) }),
+              /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--3,16))],
+          PreXmlDocEmpty, [], None,
+          /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs b/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs
rename to tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs
diff --git a/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl b/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl
new file mode 100644
index 00000000000..e4be32a4323
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl
@@ -0,0 +1,62 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs", false,
+      QualifiedNameOfFile SynPatOrContainsTheRangeOfTheBar, [], [],
+      [SynModuleOrNamespace
+         ([SynPatOrContainsTheRangeOfTheBar], false, AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (2,0--2,12),
+                 Ident x,
+                 [SynMatchClause
+                    (Or
+                       (LongIdent
+                          (SynLongIdent ([A], [], [None]), None, None, Pats [],
+                           None,
+                           /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (3,2--3,3)),
+                        LongIdent
+                          (SynLongIdent ([B], [], [None]), None, None, Pats [],
+                           None,
+                           /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (4,2--4,3)),
+                        /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (3,2--4,3),
+                        { BarRange =
+                           /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (4,0--4,1) }),
+                     None,
+                     Const
+                       (Unit,
+                        /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (4,7--4,9)),
+                     /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (3,2--4,9),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (4,4--4,6)
+                       BarRange =
+                        Some
+                          /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (3,0--3,1) });
+                  SynMatchClause
+                    (Wild
+                       /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (5,2--5,3),
+                     None,
+                     Const
+                       (Unit,
+                        /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (5,7--5,9)),
+                     /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (5,2--5,9),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (5,4--5,6)
+                       BarRange =
+                        Some
+                          /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (5,0--5,1) })],
+                 /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (2,0--5,9),
+                 { MatchKeyword =
+                    /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (2,0--2,5)
+                   WithKeyword =
+                    /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (2,8--2,12) }),
+              /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (2,0--5,9))],
+          PreXmlDocEmpty, [], None,
+          /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (2,0--6,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs
rename to tests/service/data/SyntaxTree/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs
diff --git a/tests/service/data/SyntaxTree/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..c67b57a91b9
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,57 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs", false,
+      QualifiedNameOfFile SynPatRecordContainsTheRangeOfTheEqualsSign, [], [],
+      [SynModuleOrNamespace
+         ([SynPatRecordContainsTheRangeOfTheEqualsSign], false, AnonModule,
+          [Expr
+             (Match
+                (Yes
+                   /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--2,12),
+                 Ident x,
+                 [SynMatchClause
+                    (Record
+                       ([(([], Foo),
+                          /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,8--3,9),
+                          Named
+                            (SynIdent (bar, None), false, None,
+                             /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,10--3,13)))],
+                        /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,2--3,15)),
+                     None,
+                     Const
+                       (Unit,
+                        /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,19--3,21)),
+                     /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,2--3,21),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,16--3,18)
+                       BarRange =
+                        Some
+                          /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,0--3,1) });
+                  SynMatchClause
+                    (Wild
+                       /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,2--4,3),
+                     None,
+                     Const
+                       (Unit,
+                        /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,7--4,9)),
+                     /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,2--4,9),
+                     Yes,
+                     { ArrowRange =
+                        Some
+                          /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,4--4,6)
+                       BarRange =
+                        Some
+                          /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,0--4,1) })],
+                 /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--4,9),
+                 { MatchKeyword =
+                    /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--2,5)
+                   WithKeyword =
+                    /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,8--2,12) }),
+              /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--4,9))],
+          PreXmlDocEmpty, [], None,
+          /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrefixOperation.fs.bsl b/tests/service/data/SyntaxTree/PrefixOperation.fs.bsl
deleted file mode 100644
index e84dcf46fad..00000000000
--- a/tests/service/data/SyntaxTree/PrefixOperation.fs.bsl
+++ /dev/null
@@ -1,20 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/PrefixOperation.fs", false, QualifiedNameOfFile PrefixOperation, [],
-      [],
-      [SynModuleOrNamespace
-         ([PrefixOperation], false, AnonModule,
-          [Expr
-             (App
-                (NonAtomic, false,
-                 LongIdent
-                   (false,
-                    SynLongIdent
-                      ([op_UnaryPlus], [], [Some (OriginalNotation "+")]), None,
-                    /root/PrefixOperation.fs (2,0--2,1)),
-                 Const (Int32 -86, /root/PrefixOperation.fs (2,2--2,5)),
-                 /root/PrefixOperation.fs (2,0--2,5)),
-              /root/PrefixOperation.fs (2,0--2,5))], PreXmlDocEmpty, [], None,
-          /root/PrefixOperation.fs (2,0--2,5), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs.bsl b/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs.bsl
deleted file mode 100644
index a05c920e240..00000000000
--- a/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs.bsl
+++ /dev/null
@@ -1,50 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/PrivateKeywordHasRange.fs", false,
-      QualifiedNameOfFile PrivateKeywordHasRange, [], [],
-      [SynModuleOrNamespace
-         ([PrivateKeywordHasRange], false, AnonModule,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [Currency],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/PrivateKeywordHasRange.fs (2,5--2,13)),
-                  Simple
-                    (Union
-                       (Some
-                          (Private /root/PrivateKeywordHasRange.fs (7,4--7,11)),
-                        [SynUnionCase
-                           ([], SynIdent (Code, None),
-                            Fields
-                              [SynField
-                                 ([], false, None,
-                                  LongIdent
-                                    (SynLongIdent ([string], [], [None])), false,
-                                  PreXmlDoc ((9,14), FSharp.Compiler.Xml.XmlDocCollector),
-                                  None,
-                                  /root/PrivateKeywordHasRange.fs (9,14--9,20),
-                                  { LeadingKeyword = None })],
-                            PreXmlDoc ((9,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            None, /root/PrivateKeywordHasRange.fs (9,6--9,20),
-                            { BarRange =
-                               Some /root/PrivateKeywordHasRange.fs (9,4--9,5) })],
-                        /root/PrivateKeywordHasRange.fs (7,4--9,20)),
-                     /root/PrivateKeywordHasRange.fs (7,4--9,20)), [], None,
-                  /root/PrivateKeywordHasRange.fs (2,5--9,20),
-                  { LeadingKeyword =
-                     Type /root/PrivateKeywordHasRange.fs (2,0--2,4)
-                    EqualsRange =
-                     Some /root/PrivateKeywordHasRange.fs (2,14--2,15)
-                    WithKeyword = None })],
-              /root/PrivateKeywordHasRange.fs (2,0--9,20))], PreXmlDocEmpty, [],
-          None, /root/PrivateKeywordHasRange.fs (2,0--10,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives =
-         [If
-            (Not (Ident "FABLE_COMPILER"),
-             /root/PrivateKeywordHasRange.fs (6,0--6,19));
-          EndIf /root/PrivateKeywordHasRange.fs (8,0--8,6)]
-        CodeComments =
-         [LineComment /root/PrivateKeywordHasRange.fs (3,4--3,67);
-          LineComment /root/PrivateKeywordHasRange.fs (4,4--4,56)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs.bsl
deleted file mode 100644
index 8be43807c56..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClause.fs.bsl
+++ /dev/null
@@ -1,37 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfArrowInSynMatchClause.fs", false,
-      QualifiedNameOfFile RangeOfArrowInSynMatchClause, [], [],
-      [SynModuleOrNamespace
-         ([RangeOfArrowInSynMatchClause], false, AnonModule,
-          [Expr
-             (Match
-                (Yes /root/RangeOfArrowInSynMatchClause.fs (2,0--2,14),
-                 Ident foo,
-                 [SynMatchClause
-                    (LongIdent
-                       (SynLongIdent ([Bar], [], [None]), None, None,
-                        Pats
-                          [Named
-                             (SynIdent (bar, None), false, None,
-                              /root/RangeOfArrowInSynMatchClause.fs (3,6--3,9))],
-                        None, /root/RangeOfArrowInSynMatchClause.fs (3,2--3,9)),
-                     None,
-                     Const
-                       (Unit, /root/RangeOfArrowInSynMatchClause.fs (3,13--3,15)),
-                     /root/RangeOfArrowInSynMatchClause.fs (3,2--3,15), Yes,
-                     { ArrowRange =
-                        Some /root/RangeOfArrowInSynMatchClause.fs (3,10--3,12)
-                       BarRange =
-                        Some /root/RangeOfArrowInSynMatchClause.fs (3,0--3,1) })],
-                 /root/RangeOfArrowInSynMatchClause.fs (2,0--3,15),
-                 { MatchKeyword =
-                    /root/RangeOfArrowInSynMatchClause.fs (2,0--2,5)
-                   WithKeyword =
-                    /root/RangeOfArrowInSynMatchClause.fs (2,10--2,14) }),
-              /root/RangeOfArrowInSynMatchClause.fs (2,0--3,15))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfArrowInSynMatchClause.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl b/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
deleted file mode 100644
index 5956f8ce2cf..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
+++ /dev/null
@@ -1,51 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfArrowInSynMatchClauseWithWhenClause.fs", false,
-      QualifiedNameOfFile RangeOfArrowInSynMatchClauseWithWhenClause, [], [],
-      [SynModuleOrNamespace
-         ([RangeOfArrowInSynMatchClauseWithWhenClause], false, AnonModule,
-          [Expr
-             (Match
-                (Yes
-                   /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--2,14),
-                 Ident foo,
-                 [SynMatchClause
-                    (LongIdent
-                       (SynLongIdent ([Bar], [], [None]), None, None,
-                        Pats
-                          [Named
-                             (SynIdent (bar, None), false, None,
-                              /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,6--3,9))],
-                        None,
-                        /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,2--3,9)),
-                     Some
-                       (Paren
-                          (App
-                             (NonAtomic, false, Ident someCheck, Ident bar,
-                              /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,16--3,29)),
-                           /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,15--3,16),
-                           Some
-                             /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,29--3,30),
-                           /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,15--3,30))),
-                     Const
-                       (Unit,
-                        /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,34--3,36)),
-                     /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,2--3,36),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,31--3,33)
-                       BarRange =
-                        Some
-                          /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (3,0--3,1) })],
-                 /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--3,36),
-                 { MatchKeyword =
-                    /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--2,5)
-                   WithKeyword =
-                    /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,10--2,14) }),
-              /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--3,36))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttribute.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttribute.fs.bsl
deleted file mode 100644
index 699ccd67585..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfAttribute.fs.bsl
+++ /dev/null
@@ -1,44 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfAttribute.fs", false, QualifiedNameOfFile RangeOfAttribute,
-      [], [],
-      [SynModuleOrNamespace
-         ([RangeOfAttribute], false, AnonModule,
-          [Attributes
-             ([{ Attributes =
-                  [{ TypeName = SynLongIdent ([MyAttribute], [], [None])
-                     ArgExpr =
-                      Paren
-                        (App
-                           (NonAtomic, false,
-                            App
-                              (NonAtomic, true,
-                               LongIdent
-                                 (false,
-                                  SynLongIdent
-                                    ([op_Equality], [],
-                                     [Some (OriginalNotation "=")]), None,
-                                  /root/RangeOfAttribute.fs (2,18--2,19)),
-                               Ident foo, /root/RangeOfAttribute.fs (2,14--2,19)),
-                            Const
-                              (String
-                                 ("bar", Regular,
-                                  /root/RangeOfAttribute.fs (2,19--2,24)),
-                               /root/RangeOfAttribute.fs (2,19--2,24)),
-                            /root/RangeOfAttribute.fs (2,14--2,24)),
-                         /root/RangeOfAttribute.fs (2,13--2,14),
-                         Some /root/RangeOfAttribute.fs (2,24--2,25),
-                         /root/RangeOfAttribute.fs (2,13--2,25))
-                     Target = None
-                     AppliesToGetterAndSetter = false
-                     Range = /root/RangeOfAttribute.fs (2,2--2,25) }]
-                 Range = /root/RangeOfAttribute.fs (2,0--2,27) }],
-              /root/RangeOfAttribute.fs (2,0--2,27));
-           Expr
-             (Do
-                (Const (Unit, /root/RangeOfAttribute.fs (3,3--3,5)),
-                 /root/RangeOfAttribute.fs (3,0--3,5)),
-              /root/RangeOfAttribute.fs (3,0--3,5))], PreXmlDocEmpty, [], None,
-          /root/RangeOfAttribute.fs (2,0--4,0), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
deleted file mode 100644
index 36cb7ae4a44..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
+++ /dev/null
@@ -1,59 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs",
-      false,
-      QualifiedNameOfFile
-        RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet,
-      [], [],
-      [SynModuleOrNamespace
-         ([RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet],
-          false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false,
-                  [{ Attributes =
-                      [{ TypeName = SynLongIdent ([Literal], [], [None])
-                         ArgExpr =
-                          Const
-                            (Unit,
-                             /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,6--2,13))
-                         Target = None
-                         AppliesToGetterAndSetter = false
-                         Range =
-                          /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,6--2,13) }]
-                     Range =
-                      /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,4--2,15) }],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Paren
-                    (LongIdent
-                       (SynLongIdent ([A], [], [None]), None, None,
-                        Pats
-                          [Named
-                             (SynIdent (x, None), false, None,
-                              /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,19--2,20))],
-                        None,
-                        /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,17--2,20)),
-                     /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,16--2,21)),
-                  None,
-                  Const
-                    (Int32 1,
-                     /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,24--2,25)),
-                  /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,4--2,21),
-                  Yes
-                    /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,25),
-                  { LeadingKeyword =
-                     Let
-                       /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some
-                       /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,22--2,23) })],
-              /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,0--2,25))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
deleted file mode 100644
index e7d4baa9778..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
+++ /dev/null
@@ -1,45 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs",
-      false, QualifiedNameOfFile TopLevel, [], [],
-      [SynModuleOrNamespace
-         ([TopLevel], false, NamedModule,
-          [NestedModule
-             (SynComponentInfo
-                ([{ Attributes =
-                     [{ TypeName = SynLongIdent ([Foo], [], [None])
-                        ArgExpr =
-                         Const
-                           (Unit,
-                            /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,2--4,5))
-                        Target = None
-                        AppliesToGetterAndSetter = false
-                        Range =
-                         /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,2--4,5) }]
-                    Range =
-                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,0--4,7) }],
-                 None, [], [Nested],
-                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), false,
-                 None,
-                 /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (5,0--5,13)),
-              false,
-              [Expr
-                 (Const
-                    (Unit,
-                     /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (6,4--6,6)),
-                  /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (6,4--6,6))],
-              false,
-              /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (4,0--6,6),
-              { ModuleKeyword =
-                 Some
-                   /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (5,0--5,6)
-                EqualsRange =
-                 Some
-                   /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (5,14--5,15) })],
-          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (2,0--6,6),
-          { LeadingKeyword =
-             Module
-               /root/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (2,0--2,6) })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
deleted file mode 100644
index a4755ceea82..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
+++ /dev/null
@@ -1,46 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi",
-      QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynTypeDefnSig, [],
-      [],
-      [SynModuleOrNamespaceSig
-         ([SomeNamespace], false, DeclaredNamespace,
-          [Types
-             ([SynTypeDefnSig
-                 (SynComponentInfo
-                    ([{ Attributes =
-                         [{ TypeName = SynLongIdent ([Foo1], [], [None])
-                            ArgExpr =
-                             Const
-                               (Unit,
-                                /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,2--4,6))
-                            Target = None
-                            AppliesToGetterAndSetter = false
-                            Range =
-                             /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,2--4,6) }]
-                        Range =
-                         /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,0--4,8) }],
-                     None, [], [MyType],
-                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (5,5--5,11)),
-                  ObjectModel
-                    (Class, [],
-                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (6,4--7,7)),
-                  [],
-                  /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,0--7,7),
-                  { LeadingKeyword =
-                     Type
-                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (5,0--5,4)
-                    EqualsRange =
-                     Some
-                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (5,12--5,13)
-                    WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,0--7,7))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (2,0--7,7),
-          { LeadingKeyword =
-             Namespace
-               /root/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (2,0--2,9) })],
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs.bsl
deleted file mode 100644
index 631d7674f01..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfAttributeWithPath.fs.bsl
+++ /dev/null
@@ -1,50 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfAttributeWithPath.fs", false,
-      QualifiedNameOfFile RangeOfAttributeWithPath, [], [],
-      [SynModuleOrNamespace
-         ([RangeOfAttributeWithPath], false, AnonModule,
-          [Attributes
-             ([{ Attributes =
-                  [{ TypeName =
-                      SynLongIdent
-                        ([Prefix; MyAttribute],
-                         [/root/RangeOfAttributeWithPath.fs (2,8--2,9)],
-                         [None; None])
-                     ArgExpr =
-                      Paren
-                        (App
-                           (NonAtomic, false,
-                            App
-                              (NonAtomic, true,
-                               LongIdent
-                                 (false,
-                                  SynLongIdent
-                                    ([op_Equality], [],
-                                     [Some (OriginalNotation "=")]), None,
-                                  /root/RangeOfAttributeWithPath.fs (2,25--2,26)),
-                               Ident foo,
-                               /root/RangeOfAttributeWithPath.fs (2,21--2,26)),
-                            Const
-                              (String
-                                 ("bar", Regular,
-                                  /root/RangeOfAttributeWithPath.fs (2,26--2,31)),
-                               /root/RangeOfAttributeWithPath.fs (2,26--2,31)),
-                            /root/RangeOfAttributeWithPath.fs (2,21--2,31)),
-                         /root/RangeOfAttributeWithPath.fs (2,20--2,21),
-                         Some /root/RangeOfAttributeWithPath.fs (2,31--2,32),
-                         /root/RangeOfAttributeWithPath.fs (2,20--2,32))
-                     Target = None
-                     AppliesToGetterAndSetter = false
-                     Range = /root/RangeOfAttributeWithPath.fs (2,2--2,32) }]
-                 Range = /root/RangeOfAttributeWithPath.fs (2,0--2,34) }],
-              /root/RangeOfAttributeWithPath.fs (2,0--2,34));
-           Expr
-             (Do
-                (Const (Unit, /root/RangeOfAttributeWithPath.fs (3,3--3,5)),
-                 /root/RangeOfAttributeWithPath.fs (3,0--3,5)),
-              /root/RangeOfAttributeWithPath.fs (3,0--3,5))], PreXmlDocEmpty, [],
-          None, /root/RangeOfAttributeWithPath.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs.bsl b/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs.bsl
deleted file mode 100644
index d69c1b4acd9..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfAttributeWithTarget.fs.bsl
+++ /dev/null
@@ -1,46 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfAttributeWithTarget.fs", false,
-      QualifiedNameOfFile RangeOfAttributeWithTarget, [], [],
-      [SynModuleOrNamespace
-         ([RangeOfAttributeWithTarget], false, AnonModule,
-          [Attributes
-             ([{ Attributes =
-                  [{ TypeName = SynLongIdent ([MyAttribute], [], [None])
-                     ArgExpr =
-                      Paren
-                        (App
-                           (NonAtomic, false,
-                            App
-                              (NonAtomic, true,
-                               LongIdent
-                                 (false,
-                                  SynLongIdent
-                                    ([op_Equality], [],
-                                     [Some (OriginalNotation "=")]), None,
-                                  /root/RangeOfAttributeWithTarget.fs (2,28--2,29)),
-                               Ident foo,
-                               /root/RangeOfAttributeWithTarget.fs (2,24--2,29)),
-                            Const
-                              (String
-                                 ("bar", Regular,
-                                  /root/RangeOfAttributeWithTarget.fs (2,29--2,34)),
-                               /root/RangeOfAttributeWithTarget.fs (2,29--2,34)),
-                            /root/RangeOfAttributeWithTarget.fs (2,24--2,34)),
-                         /root/RangeOfAttributeWithTarget.fs (2,23--2,24),
-                         Some /root/RangeOfAttributeWithTarget.fs (2,34--2,35),
-                         /root/RangeOfAttributeWithTarget.fs (2,23--2,35))
-                     Target = Some assembly
-                     AppliesToGetterAndSetter = false
-                     Range = /root/RangeOfAttributeWithTarget.fs (2,2--2,35) }]
-                 Range = /root/RangeOfAttributeWithTarget.fs (2,0--2,37) }],
-              /root/RangeOfAttributeWithTarget.fs (2,0--2,37));
-           Expr
-             (Do
-                (Const (Unit, /root/RangeOfAttributeWithTarget.fs (3,3--3,5)),
-                 /root/RangeOfAttributeWithTarget.fs (3,0--3,5)),
-              /root/RangeOfAttributeWithTarget.fs (3,0--3,5))], PreXmlDocEmpty,
-          [], None, /root/RangeOfAttributeWithTarget.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
deleted file mode 100644
index 29908865120..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
+++ /dev/null
@@ -1,76 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs", false,
-      QualifiedNameOfFile RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith,
-      [], [],
-      [SynModuleOrNamespace
-         ([RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith], false,
-          AnonModule,
-          [Expr
-             (TryWith
-                (App
-                   (NonAtomic, false, Ident foo,
-                    Const
-                      (Unit,
-                       /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (3,8--3,10)),
-                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (3,4--3,10)),
-                 [SynMatchClause
-                    (As
-                       (LongIdent
-                          (SynLongIdent ([IOException], [], [None]), None, None,
-                           Pats [], None,
-                           /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,2--5,13)),
-                        Named
-                          (SynIdent (ioex, None), false, None,
-                           /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,17--5,21)),
-                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,2--5,21)),
-                     None,
-                     Const
-                       (Unit,
-                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (7,4--7,6)),
-                     /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,2--7,6),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,22--5,24)
-                       BarRange =
-                        Some
-                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (5,0--5,1) });
-                  SynMatchClause
-                    (Named
-                       (SynIdent (ex, None), false, None,
-                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,2--8,4)),
-                     None,
-                     Const
-                       (Unit,
-                        /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,8--8,10)),
-                     /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,2--8,10),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,5--8,7)
-                       BarRange =
-                        Some
-                          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (8,0--8,1) })],
-                 /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--8,10),
-                 Yes
-                   /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--2,3),
-                 Yes
-                   /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,0--4,4),
-                 { TryKeyword =
-                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--2,3)
-                   TryToWithRange =
-                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--4,4)
-                   WithKeyword =
-                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,0--4,4)
-                   WithToEndRange =
-                    /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (4,0--8,10) }),
-              /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--8,10))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (2,0--9,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments =
-         [LineComment
-            /root/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (6,4--6,19)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
deleted file mode 100644
index 9bab0301378..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
+++ /dev/null
@@ -1,52 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs", false,
-      QualifiedNameOfFile RangeOfBarInASingleSynMatchClauseInSynExprMatch, [],
-      [],
-      [SynModuleOrNamespace
-         ([RangeOfBarInASingleSynMatchClauseInSynExprMatch], false, AnonModule,
-          [Expr
-             (Match
-                (Yes
-                   /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--2,14),
-                 Ident foo,
-                 [SynMatchClause
-                    (LongIdent
-                       (SynLongIdent ([Bar], [], [None]), None, None,
-                        Pats
-                          [Named
-                             (SynIdent (bar, None), false, None,
-                              /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,6--3,9))],
-                        None,
-                        /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,2--3,9)),
-                     Some
-                       (Paren
-                          (App
-                             (NonAtomic, false, Ident someCheck, Ident bar,
-                              /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,16--3,29)),
-                           /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,15--3,16),
-                           Some
-                             /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,29--3,30),
-                           /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,15--3,30))),
-                     Const
-                       (Unit,
-                        /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,34--3,36)),
-                     /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,2--3,36),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,31--3,33)
-                       BarRange =
-                        Some
-                          /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (3,0--3,1) })],
-                 /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--3,36),
-                 { MatchKeyword =
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--2,5)
-                   WithKeyword =
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,10--2,14) }),
-              /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--3,36))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
deleted file mode 100644
index 695960269ca..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
+++ /dev/null
@@ -1,50 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs", false,
-      QualifiedNameOfFile RangeOfBarInASingleSynMatchClauseInSynExprTryWith, [],
-      [],
-      [SynModuleOrNamespace
-         ([RangeOfBarInASingleSynMatchClauseInSynExprTryWith], false, AnonModule,
-          [Expr
-             (TryWith
-                (App
-                   (NonAtomic, false, Ident foo,
-                    Const
-                      (Unit,
-                       /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,8--3,10)),
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (3,4--3,10)),
-                 [SynMatchClause
-                    (Named
-                       (SynIdent (exn, None), false, None,
-                        /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,2--5,5)),
-                     None,
-                     Const
-                       (Unit,
-                        /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,9--5,11)),
-                     /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,2--5,11),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,6--5,8)
-                       BarRange =
-                        Some
-                          /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,0--5,1) })],
-                 /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--5,11),
-                 Yes
-                   /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--2,3),
-                 Yes
-                   /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,4),
-                 { TryKeyword =
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--2,3)
-                   TryToWithRange =
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--4,4)
-                   WithKeyword =
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--4,4)
-                   WithToEndRange =
-                    /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (4,0--5,11) }),
-              /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--5,11))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--6,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
deleted file mode 100644
index f325809a653..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
+++ /dev/null
@@ -1,76 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs", false,
-      QualifiedNameOfFile RangeOfBarInMultipleSynMatchClausesInSynExprMatch, [],
-      [],
-      [SynModuleOrNamespace
-         ([RangeOfBarInMultipleSynMatchClausesInSynExprMatch], false, AnonModule,
-          [Expr
-             (Match
-                (Yes
-                   /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--2,14),
-                 Ident foo,
-                 [SynMatchClause
-                    (LongIdent
-                       (SynLongIdent ([Bar], [], [None]), None, None,
-                        Pats
-                          [Named
-                             (SynIdent (bar, None), false, None,
-                              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,6--3,9))],
-                        None,
-                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,2--3,9)),
-                     Some
-                       (Paren
-                          (App
-                             (NonAtomic, false, Ident someCheck, Ident bar,
-                              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,16--3,29)),
-                           /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,15--3,16),
-                           Some
-                             /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,29--3,30),
-                           /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,15--3,30))),
-                     Const
-                       (Unit,
-                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,34--3,36)),
-                     /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,2--3,36),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,31--3,33)
-                       BarRange =
-                        Some
-                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (3,0--3,1) });
-                  SynMatchClause
-                    (LongIdent
-                       (SynLongIdent ([Far], [], [None]), None, None,
-                        Pats
-                          [Named
-                             (SynIdent (too, None), false, None,
-                              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,6--4,9))],
-                        None,
-                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,2--4,9)),
-                     None,
-                     App
-                       (NonAtomic, false, Ident near,
-                        Const
-                          (Unit,
-                           /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,18--4,20)),
-                        /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,13--4,20)),
-                     /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,2--4,20),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,10--4,12)
-                       BarRange =
-                        Some
-                          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (4,0--4,1) })],
-                 /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--4,20),
-                 { MatchKeyword =
-                    /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--2,5)
-                   WithKeyword =
-                    /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,10--2,14) }),
-              /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--4,20))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--5,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs.bsl
deleted file mode 100644
index abf8296c9f3..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresent.fs.bsl
+++ /dev/null
@@ -1,26 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfEqualSignShouldBePresent.fs", false,
-      QualifiedNameOfFile RangeOfEqualSignShouldBePresent, [], [],
-      [SynModuleOrNamespace
-         ([RangeOfEqualSignShouldBePresent], false, AnonModule,
-          [NestedModule
-             (SynComponentInfo
-                ([], None, [], [X],
-                 PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), false,
-                 None, /root/RangeOfEqualSignShouldBePresent.fs (2,0--2,8)),
-              false,
-              [Expr
-                 (Const
-                    (Unit, /root/RangeOfEqualSignShouldBePresent.fs (3,0--3,2)),
-                  /root/RangeOfEqualSignShouldBePresent.fs (3,0--3,2))], false,
-              /root/RangeOfEqualSignShouldBePresent.fs (2,0--3,2),
-              { ModuleKeyword =
-                 Some /root/RangeOfEqualSignShouldBePresent.fs (2,0--2,6)
-                EqualsRange =
-                 Some /root/RangeOfEqualSignShouldBePresent.fs (2,9--2,10) })],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresent.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs.bsl
deleted file mode 100644
index 15b59c3def6..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs.bsl
+++ /dev/null
@@ -1,57 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs", false,
-      QualifiedNameOfFile RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed,
-      [], [],
-      [SynModuleOrNamespace
-         ([RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed], false,
-          AnonModule,
-          [Expr
-             (Do
-                (LetOrUse
-                   (false, false,
-                    [SynBinding
-                       (None, Normal, false, false, [],
-                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                        SynValData
-                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None),
-                        Named
-                          (SynIdent (z, None), false, None,
-                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,8--3,9)),
-                        Some
-                          (SynBindingReturnInfo
-                             (LongIdent (SynLongIdent ([int], [], [None])),
-                              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,11--3,14),
-                              [],
-                              { ColonRange =
-                                 Some
-                                   /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,9--3,10) })),
-                        Typed
-                          (Const
-                             (Int32 2,
-                              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,17--3,18)),
-                           LongIdent (SynLongIdent ([int], [], [None])),
-                           /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,17--3,18)),
-                        /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,8--3,9),
-                        Yes
-                          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,4--3,18),
-                        { LeadingKeyword =
-                           Let
-                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,4--3,7)
-                          InlineKeyword = None
-                          EqualsRange =
-                           Some
-                             /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,15--3,16) })],
-                    Const
-                      (Unit,
-                       /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (4,4--4,6)),
-                    /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (3,4--4,6),
-                    { InKeyword = None }),
-                 /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,0--4,6)),
-              /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,0--4,6))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInLocalLetBinding,Typed.fs (2,0--5,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs.bsl b/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs.bsl
deleted file mode 100644
index 2dff3db7292..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs.bsl
+++ /dev/null
@@ -1,49 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs",
-      false,
-      QualifiedNameOfFile
-        RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed, [], [],
-      [SynModuleOrNamespace
-         ([RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed],
-          false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (v, None), false, None,
-                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,4--2,5)),
-                  Some
-                    (SynBindingReturnInfo
-                       (LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,8--2,11),
-                        [],
-                        { ColonRange =
-                           Some
-                             /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,6--2,7) })),
-                  Typed
-                    (Const
-                       (Int32 12,
-                        /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,14--2,16)),
-                     LongIdent (SynLongIdent ([int], [], [None])),
-                     /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,14--2,16)),
-                  /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,4--2,5),
-                  Yes
-                    /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,0--2,16),
-                  { LeadingKeyword =
-                     Let
-                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some
-                       /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,12--2,13) })],
-              /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,0--2,16))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding,Typed.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl b/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
deleted file mode 100644
index 2b231eebdd9..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
+++ /dev/null
@@ -1,55 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs",
-      false,
-      QualifiedNameOfFile
-        RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes,
-      [], [],
-      [SynModuleOrNamespace
-         ([RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes],
-          false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false,
-                  [{ Attributes =
-                      [{ TypeName = SynLongIdent ([SomeAttribute], [], [None])
-                         ArgExpr =
-                          Const
-                            (Unit,
-                             /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,2--3,15))
-                         Target = None
-                         AppliesToGetterAndSetter = false
-                         Range =
-                          /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,2--3,15) }]
-                     Range =
-                      /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,0--3,17) }],
-                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (v, None), false, None,
-                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (5,4--5,5)),
-                  None,
-                  Const
-                    (Int32 12,
-                     /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (5,8--5,10)),
-                  /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,0--5,5),
-                  Yes
-                    /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,0--5,10),
-                  { LeadingKeyword =
-                     Let
-                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (5,0--5,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some
-                       /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (5,6--5,7) })],
-              /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (2,0--5,10))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (3,0--6,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments =
-         [LineComment
-            /root/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (4,0--4,15)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs.bsl
deleted file mode 100644
index a8b3eb2ef2e..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfMultipleSynMatchClause.fs.bsl
+++ /dev/null
@@ -1,87 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfMultipleSynMatchClause.fs", false,
-      QualifiedNameOfFile RangeOfMultipleSynMatchClause, [], [],
-      [SynModuleOrNamespace
-         ([RangeOfMultipleSynMatchClause], false, AnonModule,
-          [Expr
-             (TryWith
-                (LetOrUse
-                   (false, false,
-                    [SynBinding
-                       (None, Normal, false, false, [],
-                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                        SynValData
-                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None),
-                        Named
-                          (SynIdent (content, None), false, None,
-                           /root/RangeOfMultipleSynMatchClause.fs (3,8--3,15)),
-                        None,
-                        App
-                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
-                           /root/RangeOfMultipleSynMatchClause.fs (3,18--3,37)),
-                        /root/RangeOfMultipleSynMatchClause.fs (3,8--3,15),
-                        Yes /root/RangeOfMultipleSynMatchClause.fs (3,4--3,37),
-                        { LeadingKeyword =
-                           Let /root/RangeOfMultipleSynMatchClause.fs (3,4--3,7)
-                          InlineKeyword = None
-                          EqualsRange =
-                           Some
-                             /root/RangeOfMultipleSynMatchClause.fs (3,16--3,17) })],
-                    App
-                      (NonAtomic, false, Ident Some, Ident content,
-                       /root/RangeOfMultipleSynMatchClause.fs (4,4--4,16)),
-                    /root/RangeOfMultipleSynMatchClause.fs (3,4--4,16),
-                    { InKeyword = None }),
-                 [SynMatchClause
-                    (Named
-                       (SynIdent (ex, None), false, None,
-                        /root/RangeOfMultipleSynMatchClause.fs (6,2--6,4)), None,
-                     Sequential
-                       (SuppressNeither, true,
-                        App
-                          (NonAtomic, false,
-                           LongIdent
-                             (false,
-                              SynLongIdent
-                                ([Infrastructure; ReportWarning],
-                                 [/root/RangeOfMultipleSynMatchClause.fs (7,18--7,19)],
-                                 [None; None]), None,
-                              /root/RangeOfMultipleSynMatchClause.fs (7,4--7,32)),
-                           Ident ex,
-                           /root/RangeOfMultipleSynMatchClause.fs (7,4--7,35)),
-                        Ident None,
-                        /root/RangeOfMultipleSynMatchClause.fs (7,4--8,8)),
-                     /root/RangeOfMultipleSynMatchClause.fs (6,2--8,8), Yes,
-                     { ArrowRange =
-                        Some /root/RangeOfMultipleSynMatchClause.fs (6,5--6,7)
-                       BarRange =
-                        Some /root/RangeOfMultipleSynMatchClause.fs (6,0--6,1) });
-                  SynMatchClause
-                    (Named
-                       (SynIdent (exx, None), false, None,
-                        /root/RangeOfMultipleSynMatchClause.fs (9,2--9,5)), None,
-                     Ident None,
-                     /root/RangeOfMultipleSynMatchClause.fs (9,2--10,8), Yes,
-                     { ArrowRange =
-                        Some /root/RangeOfMultipleSynMatchClause.fs (9,6--9,8)
-                       BarRange =
-                        Some /root/RangeOfMultipleSynMatchClause.fs (9,0--9,1) })],
-                 /root/RangeOfMultipleSynMatchClause.fs (2,0--10,8),
-                 Yes /root/RangeOfMultipleSynMatchClause.fs (2,0--2,3),
-                 Yes /root/RangeOfMultipleSynMatchClause.fs (5,0--5,4),
-                 { TryKeyword =
-                    /root/RangeOfMultipleSynMatchClause.fs (2,0--2,3)
-                   TryToWithRange =
-                    /root/RangeOfMultipleSynMatchClause.fs (2,0--5,4)
-                   WithKeyword =
-                    /root/RangeOfMultipleSynMatchClause.fs (5,0--5,4)
-                   WithToEndRange =
-                    /root/RangeOfMultipleSynMatchClause.fs (5,0--10,8) }),
-              /root/RangeOfMultipleSynMatchClause.fs (2,0--10,8))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfMultipleSynMatchClause.fs (2,0--11,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs.bsl
deleted file mode 100644
index e2f459420f3..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClause.fs.bsl
+++ /dev/null
@@ -1,73 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfSingleSynMatchClause.fs", false,
-      QualifiedNameOfFile RangeOfSingleSynMatchClause, [], [],
-      [SynModuleOrNamespace
-         ([RangeOfSingleSynMatchClause], false, AnonModule,
-          [Expr
-             (TryWith
-                (LetOrUse
-                   (false, false,
-                    [SynBinding
-                       (None, Normal, false, false, [],
-                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                        SynValData
-                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None),
-                        Named
-                          (SynIdent (content, None), false, None,
-                           /root/RangeOfSingleSynMatchClause.fs (3,8--3,15)),
-                        None,
-                        App
-                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
-                           /root/RangeOfSingleSynMatchClause.fs (3,18--3,37)),
-                        /root/RangeOfSingleSynMatchClause.fs (3,8--3,15),
-                        Yes /root/RangeOfSingleSynMatchClause.fs (3,4--3,37),
-                        { LeadingKeyword =
-                           Let /root/RangeOfSingleSynMatchClause.fs (3,4--3,7)
-                          InlineKeyword = None
-                          EqualsRange =
-                           Some
-                             /root/RangeOfSingleSynMatchClause.fs (3,16--3,17) })],
-                    App
-                      (NonAtomic, false, Ident Some, Ident content,
-                       /root/RangeOfSingleSynMatchClause.fs (4,4--4,16)),
-                    /root/RangeOfSingleSynMatchClause.fs (3,4--4,16),
-                    { InKeyword = None }),
-                 [SynMatchClause
-                    (Named
-                       (SynIdent (ex, None), false, None,
-                        /root/RangeOfSingleSynMatchClause.fs (5,5--5,7)), None,
-                     Sequential
-                       (SuppressNeither, true,
-                        App
-                          (NonAtomic, false,
-                           LongIdent
-                             (false,
-                              SynLongIdent
-                                ([Infrastructure; ReportWarning],
-                                 [/root/RangeOfSingleSynMatchClause.fs (6,18--6,19)],
-                                 [None; None]), None,
-                              /root/RangeOfSingleSynMatchClause.fs (6,4--6,32)),
-                           Ident ex,
-                           /root/RangeOfSingleSynMatchClause.fs (6,4--6,35)),
-                        Ident None,
-                        /root/RangeOfSingleSynMatchClause.fs (6,4--7,8)),
-                     /root/RangeOfSingleSynMatchClause.fs (5,5--7,8), Yes,
-                     { ArrowRange =
-                        Some /root/RangeOfSingleSynMatchClause.fs (5,8--5,10)
-                       BarRange = None })],
-                 /root/RangeOfSingleSynMatchClause.fs (2,0--7,8),
-                 Yes /root/RangeOfSingleSynMatchClause.fs (2,0--2,3),
-                 Yes /root/RangeOfSingleSynMatchClause.fs (5,0--5,4),
-                 { TryKeyword = /root/RangeOfSingleSynMatchClause.fs (2,0--2,3)
-                   TryToWithRange =
-                    /root/RangeOfSingleSynMatchClause.fs (2,0--5,4)
-                   WithKeyword = /root/RangeOfSingleSynMatchClause.fs (5,0--5,4)
-                   WithToEndRange =
-                    /root/RangeOfSingleSynMatchClause.fs (5,0--7,8) }),
-              /root/RangeOfSingleSynMatchClause.fs (2,0--7,8))], PreXmlDocEmpty,
-          [], None, /root/RangeOfSingleSynMatchClause.fs (2,0--8,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
deleted file mode 100644
index 1ecd4f971e6..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
+++ /dev/null
@@ -1,73 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfSingleSynMatchClauseFollowedByBar.fs", false,
-      QualifiedNameOfFile RangeOfSingleSynMatchClauseFollowedByBar, [], [],
-      [SynModuleOrNamespace
-         ([RangeOfSingleSynMatchClauseFollowedByBar], false, AnonModule,
-          [Expr
-             (TryWith
-                (LetOrUse
-                   (false, false,
-                    [SynBinding
-                       (None, Normal, false, false, [],
-                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                        SynValData
-                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None),
-                        Named
-                          (SynIdent (content, None), false, None,
-                           /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,8--3,15)),
-                        None,
-                        App
-                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
-                           /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,18--3,37)),
-                        /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,8--3,15),
-                        Yes
-                          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,4--3,37),
-                        { LeadingKeyword =
-                           Let
-                             /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,4--3,7)
-                          InlineKeyword = None
-                          EqualsRange =
-                           Some
-                             /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,16--3,17) })],
-                    App
-                      (NonAtomic, false, Ident Some, Ident content,
-                       /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (4,4--4,16)),
-                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (3,4--4,16),
-                    { InKeyword = None }),
-                 [SynMatchClause
-                    (Named
-                       (SynIdent (ex, None), false, None,
-                        /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,2--6,4)),
-                     None,
-                     Const
-                       (Unit,
-                        /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (7,4--7,6)),
-                     /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,2--7,6),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,5--6,7)
-                       BarRange =
-                        Some
-                          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (6,0--6,1) })],
-                 /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--8,1),
-                 Yes
-                   /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--2,3),
-                 Yes
-                   /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,0--5,4),
-                 { TryKeyword =
-                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--2,3)
-                   TryToWithRange =
-                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--5,4)
-                   WithKeyword =
-                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,0--5,4)
-                   WithToEndRange =
-                    /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (5,0--8,1) }),
-              /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--8,1))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--9,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
deleted file mode 100644
index 28bc8db01e1..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
+++ /dev/null
@@ -1,71 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfSingleSynMatchClauseWithMissingBody.fs", false,
-      QualifiedNameOfFile RangeOfSingleSynMatchClauseWithMissingBody, [], [],
-      [SynModuleOrNamespace
-         ([RangeOfSingleSynMatchClauseWithMissingBody], false, AnonModule,
-          [Expr
-             (TryWith
-                (LetOrUse
-                   (false, false,
-                    [SynBinding
-                       (None, Normal, false, false, [],
-                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                        SynValData
-                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None),
-                        Named
-                          (SynIdent (content, None), false, None,
-                           /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,8--3,15)),
-                        None,
-                        App
-                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
-                           /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,18--3,37)),
-                        /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,8--3,15),
-                        Yes
-                          /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,4--3,37),
-                        { LeadingKeyword =
-                           Let
-                             /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,4--3,7)
-                          InlineKeyword = None
-                          EqualsRange =
-                           Some
-                             /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,16--3,17) })],
-                    App
-                      (NonAtomic, false, Ident Some, Ident content,
-                       /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (4,4--4,16)),
-                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (3,4--4,16),
-                    { InKeyword = None }),
-                 [SynMatchClause
-                    (Named
-                       (SynIdent (ex, None), false, None,
-                        /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (6,2--6,4)),
-                     None,
-                     ArbitraryAfterError
-                       ("patternClauses2",
-                        /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (6,4--6,4)),
-                     /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (6,2--6,4),
-                     Yes,
-                     { ArrowRange = None
-                       BarRange =
-                        Some
-                          /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (6,0--6,1) })],
-                 /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--6,4),
-                 Yes
-                   /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--2,3),
-                 Yes
-                   /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,0--5,4),
-                 { TryKeyword =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--2,3)
-                   TryToWithRange =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--5,4)
-                   WithKeyword =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,0--5,4)
-                   WithToEndRange =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (5,0--6,4) }),
-              /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--6,4))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--7,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl b/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
deleted file mode 100644
index 699d00ea747..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
+++ /dev/null
@@ -1,81 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs", false,
-      QualifiedNameOfFile RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr,
-      [], [],
-      [SynModuleOrNamespace
-         ([RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr], false,
-          AnonModule,
-          [Expr
-             (TryWith
-                (LetOrUse
-                   (false, false,
-                    [SynBinding
-                       (None, Normal, false, false, [],
-                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                        SynValData
-                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None),
-                        Named
-                          (SynIdent (content, None), false, None,
-                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,8--3,15)),
-                        None,
-                        App
-                          (NonAtomic, false, Ident tryDownloadFile, Ident url,
-                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,18--3,37)),
-                        /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,8--3,15),
-                        Yes
-                          /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,4--3,37),
-                        { LeadingKeyword =
-                           Let
-                             /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,4--3,7)
-                          InlineKeyword = None
-                          EqualsRange =
-                           Some
-                             /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,16--3,17) })],
-                    App
-                      (NonAtomic, false, Ident Some, Ident content,
-                       /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (4,4--4,16)),
-                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (3,4--4,16),
-                    { InKeyword = None }),
-                 [SynMatchClause
-                    (Named
-                       (SynIdent (ex, None), false, None,
-                        /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,2--6,4)),
-                     Some
-                       (Paren
-                          (App
-                             (NonAtomic, false, Ident isNull, Ident ex,
-                              /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,11--6,20)),
-                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,10--6,11),
-                           Some
-                             /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,20--6,21),
-                           /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,10--6,21))),
-                     ArbitraryAfterError
-                       ("patternClauses2",
-                        /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,21--6,21)),
-                     /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,2--6,21),
-                     Yes,
-                     { ArrowRange = None
-                       BarRange =
-                        Some
-                          /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (6,0--6,1) })],
-                 /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--6,21),
-                 Yes
-                   /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--2,3),
-                 Yes
-                   /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,0--5,4),
-                 { TryKeyword =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--2,3)
-                   TryToWithRange =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--5,4)
-                   WithKeyword =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,0--5,4)
-                   WithToEndRange =
-                    /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (5,0--6,21) }),
-              /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--6,21))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--7,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
deleted file mode 100644
index 3112e7b054d..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
+++ /dev/null
@@ -1,63 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi",
-      QualifiedNameOfFile RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal, [], [],
-      [SynModuleOrNamespaceSig
-         ([Z], false, DeclaredNamespace,
-          [Types
-             ([SynTypeDefnSig
-                 (SynComponentInfo
-                    ([], None, [], [SomeCollection],
-                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,5--3,19)),
-                  Simple
-                    (None
-                       /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,5--5,37),
-                     /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,5--5,37)),
-                  [ValField
-                     (SynField
-                        ([], false, Some LastIndex,
-                         LongIdent (SynLongIdent ([int], [], [None])), false,
-                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
-                         None,
-                         /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,23),
-                         { LeadingKeyword =
-                            Some
-                              (Val
-                                 /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,7)) }),
-                      /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,23));
-                   ValField
-                     (SynField
-                        ([], false, Some SomeThingElse,
-                         Fun
-                           (LongIdent (SynLongIdent ([int], [], [None])),
-                            LongIdent (SynLongIdent ([string], [], [None])),
-                            /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,24--5,37),
-                            { ArrowRange =
-                               /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,28--5,30) }),
-                         false,
-                         PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
-                         None,
-                         /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,4--5,37),
-                         { LeadingKeyword =
-                            Some
-                              (Val
-                                 /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,4--5,7)) }),
-                      /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,4--5,37))],
-                  /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,5--5,37),
-                  { LeadingKeyword =
-                     Type
-                       /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,0--3,4)
-                    EqualsRange = None
-                    WithKeyword =
-                     Some
-                       /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,20--3,24) })],
-              /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,0--5,37))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,0--5,37),
-          { LeadingKeyword =
-             Namespace
-               /root/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,0--2,9) })],
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl b/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
deleted file mode 100644
index 7fefb8220ff..00000000000
--- a/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
+++ /dev/null
@@ -1,31 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/RangeOfTypeShouldEndAtEndKeyword.fsi",
-      QualifiedNameOfFile RangeOfTypeShouldEndAtEndKeyword, [], [],
-      [SynModuleOrNamespaceSig
-         ([GreatProjectThing], false, DeclaredNamespace,
-          [Types
-             ([SynTypeDefnSig
-                 (SynComponentInfo
-                    ([], None, [], [Meh],
-                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/RangeOfTypeShouldEndAtEndKeyword.fsi (4,5--4,8)),
-                  ObjectModel
-                    (Class, [],
-                     /root/RangeOfTypeShouldEndAtEndKeyword.fsi (5,8--6,11)), [],
-                  /root/RangeOfTypeShouldEndAtEndKeyword.fsi (4,5--6,11),
-                  { LeadingKeyword =
-                     Type /root/RangeOfTypeShouldEndAtEndKeyword.fsi (4,0--4,4)
-                    EqualsRange =
-                     Some /root/RangeOfTypeShouldEndAtEndKeyword.fsi (4,9--4,10)
-                    WithKeyword = None })],
-              /root/RangeOfTypeShouldEndAtEndKeyword.fsi (4,0--6,11))],
-          PreXmlDocEmpty, [], None,
-          /root/RangeOfTypeShouldEndAtEndKeyword.fsi (2,0--6,11),
-          { LeadingKeyword =
-             Namespace /root/RangeOfTypeShouldEndAtEndKeyword.fsi (2,0--2,9) })],
-      { ConditionalDirectives = []
-        CodeComments =
-         [LineComment /root/RangeOfTypeShouldEndAtEndKeyword.fsi (9,0--9,6)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs.bsl
deleted file mode 100644
index 4d4f4378c4f..00000000000
--- a/tests/service/data/SyntaxTree/RegularStringAsParsedHashDirectiveArgument.fs.bsl
+++ /dev/null
@@ -1,16 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/RegularStringAsParsedHashDirectiveArgument.fs", false,
-      QualifiedNameOfFile RegularStringAsParsedHashDirectiveArgument, [], [],
-      [SynModuleOrNamespace
-         ([RegularStringAsParsedHashDirectiveArgument], false, AnonModule,
-          [HashDirective
-             (ParsedHashDirective
-                ("I", [],
-                 /root/RegularStringAsParsedHashDirectiveArgument.fs (2,0--2,2)),
-              /root/RegularStringAsParsedHashDirectiveArgument.fs (2,0--2,4))],
-          PreXmlDocEmpty, [], None,
-          /root/RegularStringAsParsedHashDirectiveArgument.fs (2,0--2,4),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi
rename to tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi
diff --git a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
similarity index 58%
rename from tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
index 5ed8d127373..ddc31b1d579 100644
--- a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
@@ -1,7 +1,7 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/EqualsTokenIsPresentInSynValSigMember.fsi", QualifiedNameOfFile Meh,
-      [], [],
+     ("/root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi",
+      QualifiedNameOfFile Meh, [], [],
       [SynModuleOrNamespaceSig
          ([Meh], false, NamedModule,
           [Types
@@ -10,7 +10,7 @@ SigFile
                     ([], None, [], [X],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,5--4,6)),
+                     /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -25,38 +25,39 @@ SigFile
                             Some
                               (Const
                                  (Int32 10,
-                                  /root/EqualsTokenIsPresentInSynValSigMember.fsi (5,21--5,23))),
-                            /root/EqualsTokenIsPresentInSynValSigMember.fsi (5,4--5,23),
+                                  /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (5,21--5,23))),
+                            /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (5,4--5,23),
                             { LeadingKeyword =
                                Member
-                                 /root/EqualsTokenIsPresentInSynValSigMember.fsi (5,4--5,10)
+                                 /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (5,4--5,10)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange =
                                Some
-                                 /root/EqualsTokenIsPresentInSynValSigMember.fsi (5,19--5,20) }),
+                                 /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (5,19--5,20) }),
                          { IsInstance = true
                            IsDispatchSlot = false
                            IsOverrideOrExplicitImpl = false
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/EqualsTokenIsPresentInSynValSigMember.fsi (5,4--5,23),
+                         /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (5,4--5,23),
                          { GetSetKeywords = None })],
-                     /root/EqualsTokenIsPresentInSynValSigMember.fsi (5,4--5,23)),
+                     /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (5,4--5,23)),
                   [],
-                  /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,5--5,23),
+                  /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (4,5--5,23),
                   { LeadingKeyword =
                      Type
-                       /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,0--4,4)
+                       /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,7--4,8)
+                       /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/EqualsTokenIsPresentInSynValSigMember.fsi (4,0--5,23))],
+              /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (4,0--5,23))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/EqualsTokenIsPresentInSynValSigMember.fsi (2,0--5,23),
+          /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (2,0--5,23),
           { LeadingKeyword =
-             Module /root/EqualsTokenIsPresentInSynValSigMember.fsi (2,0--2,6) })],
+             Module
+               /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi
rename to tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi
diff --git a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
index 9000b5380d6..59522df7fff 100644
--- a/tests/service/data/SyntaxTree/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
@@ -1,7 +1,7 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/EqualsTokenIsPresentInSynValSigValue.fsi", QualifiedNameOfFile Meh,
-      [], [],
+     ("/root/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi",
+      QualifiedNameOfFile Meh, [], [],
       [SynModuleOrNamespaceSig
          ([Meh], false, NamedModule,
           [Val
@@ -13,20 +13,21 @@ SigFile
                  Some
                    (Const
                       (Int32 9,
-                       /root/EqualsTokenIsPresentInSynValSigValue.fsi (4,14--4,15))),
-                 /root/EqualsTokenIsPresentInSynValSigValue.fsi (4,0--4,15),
+                       /root/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi (4,14--4,15))),
+                 /root/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi (4,0--4,15),
                  { LeadingKeyword =
                     Val
-                      /root/EqualsTokenIsPresentInSynValSigValue.fsi (4,0--4,3)
+                      /root/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi (4,0--4,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange =
                     Some
-                      /root/EqualsTokenIsPresentInSynValSigValue.fsi (4,12--4,13) }),
-              /root/EqualsTokenIsPresentInSynValSigValue.fsi (4,0--4,15))],
+                      /root/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi (4,12--4,13) }),
+              /root/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi (4,0--4,15))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/EqualsTokenIsPresentInSynValSigValue.fsi (2,0--4,15),
+          /root/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi (2,0--4,15),
           { LeadingKeyword =
-             Module /root/EqualsTokenIsPresentInSynValSigValue.fsi (2,0--2,6) })],
+             Module
+               /root/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi b/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/LeadingKeywordInRecursiveTypes.fsi
rename to tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi
diff --git a/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl
new file mode 100644
index 00000000000..7e915bc20d8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl
@@ -0,0 +1,52 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SignatureType/LeadingKeywordInRecursiveTypes.fsi",
+      QualifiedNameOfFile LeadingKeywordInRecursiveTypes, [], [],
+      [SynModuleOrNamespaceSig
+         ([LeadingKeywordInRecursiveTypes], false, AnonModule,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [A],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (2,5--2,6)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok, LongIdent (SynLongIdent ([obj], [], [None])),
+                        /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (2,9--2,12)),
+                     /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (2,9--2,12)),
+                  [],
+                  /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (2,5--2,12),
+                  { LeadingKeyword =
+                     Type
+                       /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (2,7--2,8)
+                    WithKeyword = None });
+               SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [B],
+                     PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (3,4--3,5)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok, LongIdent (SynLongIdent ([int], [], [None])),
+                        /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (3,8--3,11)),
+                     /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (3,8--3,11)),
+                  [],
+                  /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (3,4--3,11),
+                  { LeadingKeyword =
+                     And
+                       /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (3,0--3,3)
+                    EqualsRange =
+                     Some
+                       /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (3,6--3,7)
+                    WithKeyword = None })],
+              /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (2,0--3,11))],
+          PreXmlDocEmpty, [], None,
+          /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (2,0--4,0),
+          { LeadingKeyword = None })], { ConditionalDirectives = []
+                                         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi b/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi
rename to tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi
diff --git a/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
similarity index 50%
rename from tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
index 27bff41007e..e4ee287f0ad 100644
--- a/tests/service/data/SyntaxTree/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi",
+     ("/root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi",
       QualifiedNameOfFile
         MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword, [],
       [],
@@ -12,7 +12,7 @@ SigFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--4,8)),
+                     /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--4,8)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -24,15 +24,15 @@ SigFile
                             false,
                             PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,4--5,42),
+                            /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,4--5,42),
                             { LeadingKeyword =
                                AbstractMember
-                                 (/root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,4--5,12),
-                                  /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,13--5,19))
+                                 (/root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,4--5,12),
+                                  /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,13--5,19))
                               InlineKeyword = None
                               WithKeyword =
                                Some
-                                 /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,30--5,34)
+                                 /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,30--5,34)
                               EqualsRange = None }),
                          { IsInstance = true
                            IsDispatchSlot = true
@@ -40,27 +40,27 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGetSet },
-                         /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,4--5,42),
+                         /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,4--5,42),
                          { GetSetKeywords =
                             Some
                               (GetSet
-                                 (/root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,35--5,38),
-                                  /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,39--5,42))) })],
-                     /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,4--5,42)),
+                                 (/root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,35--5,38),
+                                  /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,39--5,42))) })],
+                     /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (5,4--5,42)),
                   [],
-                  /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--5,42),
+                  /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--5,42),
                   { LeadingKeyword =
                      Type
-                       /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,4)
+                       /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,9--4,10)
+                       /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,9--4,10)
                     WithKeyword = None })],
-              /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--5,42))],
+              /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--5,42))],
           PreXmlDocEmpty, [], None,
-          /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--5,42),
+          /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--5,42),
           { LeadingKeyword =
              Namespace
-               /root/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--2,9) })],
+               /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi b/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi
rename to tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi
diff --git a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
similarity index 50%
rename from tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
index 25c2336908f..9e69d6c8bc8 100644
--- a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi",
+     ("/root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi",
       QualifiedNameOfFile NestedTypeHasStaticTypeAsLeadingKeyword, [], [],
       [SynModuleOrNamespaceSig
          ([NestedTypeHasStaticTypeAsLeadingKeyword], false, AnonModule,
@@ -10,7 +10,7 @@ SigFile
                     ([], None, [], [A],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,5--2,6)),
+                     /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [NestedType
@@ -19,33 +19,33 @@ SigFile
                               ([], None, [], [B],
                                PreXmlDoc ((3,16), FSharp.Compiler.Xml.XmlDocCollector),
                                false, None,
-                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,16--3,17)),
+                               /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,16--3,17)),
                             ObjectModel
                               (Class, [],
-                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (4,20--5,23)),
+                               /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (4,20--5,23)),
                             [],
-                            /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,16--5,23),
+                            /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,16--5,23),
                             { LeadingKeyword =
                                StaticType
-                                 (/root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,4--3,10),
-                                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,11--3,15))
+                                 (/root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,4--3,10),
+                                  /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,11--3,15))
                               EqualsRange =
                                Some
-                                 /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,18--3,19)
+                                 /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,18--3,19)
                               WithKeyword = None }),
-                         /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,4--6,0))],
-                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,4--6,0)),
+                         /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,4--6,0))],
+                     /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (3,4--6,0)),
                   [],
-                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,5--6,0),
+                  /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,5--6,0),
                   { LeadingKeyword =
                      Type
-                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,0--2,4)
+                       /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,7--2,8)
+                       /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,7--2,8)
                     WithKeyword = None })],
-              /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,0--6,0))],
+              /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,0--6,0))],
           PreXmlDocEmpty, [], None,
-          /root/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,0--6,0),
+          /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,0--6,0),
           { LeadingKeyword = None })], { ConditionalDirectives = []
                                          CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
index 8511cbfea33..6424dfe8b09 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi",
+     ("/root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi",
       QualifiedNameOfFile FSharp.Compiler.ParseHelpers, [], [],
       [SynModuleOrNamespaceSig
          ([FSharp; Compiler; ParseHelpers], false, NamedModule,
@@ -12,22 +12,22 @@ SigFile
                            ArgExpr =
                             Const
                               (Unit,
-                               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,2--5,12))
+                               /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,2--5,12))
                            Target = None
                            AppliesToGetterAndSetter = false
                            Range =
-                            /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,2--5,12) };
+                            /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,2--5,12) };
                          { TypeName = SynLongIdent ([NoComparison], [], [None])
                            ArgExpr =
                             Const
                               (Unit,
-                               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,14--5,26))
+                               /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,14--5,26))
                            Target = None
                            AppliesToGetterAndSetter = false
                            Range =
-                            /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,14--5,26) }]
+                            /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,14--5,26) }]
                        Range =
-                        /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,0--5,28) }],
+                        /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,0--5,28) }],
                     SynUnionCase
                       ([], SynIdent (SyntaxError, None),
                        Fields
@@ -36,7 +36,7 @@ SigFile
                              LongIdent (SynLongIdent ([obj], [], [None])), false,
                              PreXmlDoc ((6,25), FSharp.Compiler.Xml.XmlDocCollector),
                              None,
-                             /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (6,25--6,28),
+                             /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (6,25--6,28),
                              { LeadingKeyword = None });
                           SynField
                             ([], false, Some range,
@@ -44,25 +44,25 @@ SigFile
                              false,
                              PreXmlDoc ((6,31), FSharp.Compiler.Xml.XmlDocCollector),
                              None,
-                             /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (6,31--6,43),
+                             /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (6,31--6,43),
                              { LeadingKeyword = None })], PreXmlDocEmpty, None,
-                       /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (6,10--6,43),
+                       /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (6,10--6,43),
                        { BarRange = None }), None,
                     PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                    /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,0--6,43)),
+                    /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,0--6,43)),
                  None, [],
-                 /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,0--6,43)),
-              /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,0--6,43))],
+                 /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,0--6,43)),
+              /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (5,0--6,43))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [],
           Some
             (Internal
-               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (2,7--2,15)),
-          /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (2,0--6,43),
+               /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (2,7--2,15)),
+          /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (2,0--6,43),
           { LeadingKeyword =
              Module
-               /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (2,0--2,6) })],
+               /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,0--4,90)] },
+            /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,0--4,90)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi
diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
new file mode 100644
index 00000000000..ffd9785fdea
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
@@ -0,0 +1,46 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi",
+      QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynTypeDefnSig, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([SomeNamespace], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([{ Attributes =
+                         [{ TypeName = SynLongIdent ([Foo1], [], [None])
+                            ArgExpr =
+                             Const
+                               (Unit,
+                                /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,2--4,6))
+                            Target = None
+                            AppliesToGetterAndSetter = false
+                            Range =
+                             /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,2--4,6) }]
+                        Range =
+                         /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,0--4,8) }],
+                     None, [], [MyType],
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (5,5--5,11)),
+                  ObjectModel
+                    (Class, [],
+                     /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (6,4--7,7)),
+                  [],
+                  /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,0--7,7),
+                  { LeadingKeyword =
+                     Type
+                       /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (5,0--5,4)
+                    EqualsRange =
+                     Some
+                       /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (5,12--5,13)
+                    WithKeyword = None })],
+              /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (4,0--7,7))],
+          PreXmlDocEmpty, [], None,
+          /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (2,0--7,7),
+          { LeadingKeyword =
+             Namespace
+               /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (2,0--2,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
similarity index 57%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
index 4fccca46d78..fc469fbc0aa 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi",
+     ("/root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi",
       QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember,
       [], [],
       [SynModuleOrNamespaceSig
@@ -11,7 +11,7 @@ SigFile
                     ([], None, [], [FooType],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,5--4,12)),
+                     /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,5--4,12)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -21,23 +21,23 @@ SigFile
                                    ArgExpr =
                                     Const
                                       (Unit,
-                                       /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,6--5,10))
+                                       /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,6--5,10))
                                    Target = None
                                    AppliesToGetterAndSetter = false
                                    Range =
-                                    /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,6--5,10) }]
+                                    /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,6--5,10) }]
                                Range =
-                                /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--5,12) }],
+                                /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--5,12) }],
                             SynIdent (x, None), SynValTyparDecls (None, true),
                             LongIdent (SynLongIdent ([int], [], [None])),
                             SynValInfo ([], SynArgInfo ([], false, None)), false,
                             false,
                             PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--6,20),
+                            /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--6,20),
                             { LeadingKeyword =
                                Abstract
-                                 /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (6,4--6,12)
+                                 /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (6,4--6,12)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -47,26 +47,26 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--6,20),
+                         /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--6,20),
                          { GetSetKeywords = None })],
-                     /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--6,20)),
+                     /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,4--6,20)),
                   [],
-                  /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,5--6,20),
+                  /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,5--6,20),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,0--4,4)
+                       /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,13--4,14)
+                       /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,13--4,14)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,0--6,20))],
+              /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (4,0--6,20))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (2,0--6,20),
+          /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (2,0--6,20),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (2,0--2,9) })],
+               /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,13--5,23)] },
+            /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,13--5,23)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
index 02f1465f598..d5d5241d319 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi",
+     ("/root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi",
       QualifiedNameOfFile RangeOfAttributesShouldBeIncludedInRecursiveTypes, [],
       [],
       [SynModuleOrNamespaceSig
@@ -11,7 +11,7 @@ SigFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,5--4,8)),
+                     /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,5--4,8)),
                   Simple
                     (Union
                        (None,
@@ -19,20 +19,20 @@ SigFile
                            ([], SynIdent (Bar, None), Fields [],
                             PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (5,6--5,9),
+                            /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (5,6--5,9),
                             { BarRange =
                                Some
-                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (5,4--5,5) })],
-                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (5,4--5,9)),
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (5,4--5,9)),
+                                 /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (5,4--5,5) })],
+                        /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (5,4--5,9)),
+                     /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (5,4--5,9)),
                   [],
-                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,5--5,9),
+                  /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,5--5,9),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,0--4,4)
+                       /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,9--4,10)
+                       /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,9--4,10)
                     WithKeyword = None });
                SynTypeDefnSig
                  (SynComponentInfo
@@ -42,31 +42,31 @@ SigFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,6--7,20))
+                                /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,6--7,20))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,6--7,20) }]
+                             /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,6--7,20) }]
                         Range =
-                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,4--7,22) }],
+                         /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,4--7,22) }],
                      None, [], [Bang],
                      PreXmlDoc ((7,4), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,23--7,27)),
+                     /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,23--7,27)),
                   Simple
                     (Record
                        (Some
                           (Internal
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (8,4--8,12)),
+                             /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (8,4--8,12)),
                         [SynField
                            ([], false, Some LongNameBarBarBarBarBarBarBar,
                             LongIdent (SynLongIdent ([int], [], [None])), false,
                             PreXmlDoc ((10,12), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (10,12--10,46),
+                            /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (10,12--10,46),
                             { LeadingKeyword = None })],
-                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (8,4--11,9)),
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (8,4--11,9)),
+                        /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (8,4--11,9)),
+                     /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (8,4--11,9)),
                   [Member
                      (SynValSig
                         ([], SynIdent (GetHashCode, None),
@@ -74,18 +74,18 @@ SigFile
                          Fun
                            (LongIdent (SynLongIdent ([unit], [], [None])),
                             LongIdent (SynLongIdent ([int], [], [None])),
-                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,31--12,42),
+                            /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,31--12,42),
                             { ArrowRange =
-                               /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,36--12,38) }),
+                               /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,36--12,38) }),
                          SynValInfo
                            ([[SynArgInfo ([], false, None)]],
                             SynArgInfo ([], false, None)), false, false,
                          PreXmlDoc ((12,8), FSharp.Compiler.Xml.XmlDocCollector),
                          None, None,
-                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,8--12,42),
+                         /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,8--12,42),
                          { LeadingKeyword =
                             Override
-                              /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,8--12,16)
+                              /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,8--12,16)
                            InlineKeyword = None
                            WithKeyword = None
                            EqualsRange = None }),
@@ -95,21 +95,21 @@ SigFile
                         IsFinal = false
                         GetterOrSetterIsCompilerGenerated = false
                         MemberKind = Member },
-                      /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,8--12,42),
+                      /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (12,8--12,42),
                       { GetSetKeywords = None })],
-                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,4--12,42),
+                  /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,4--12,42),
                   { LeadingKeyword =
                      And
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,0--7,3)
+                       /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,0--7,3)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,28--7,29)
+                       /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (7,28--7,29)
                     WithKeyword = None })],
-              /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,0--12,42))],
+              /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (4,0--12,42))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (2,0--12,42),
+          /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (2,0--12,42),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (2,0--2,9) })],
+               /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi b/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi
diff --git a/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
index c918d26faf1..b3b90078243 100644
--- a/tests/service/data/SyntaxTree/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi",
+     ("/root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi",
       QualifiedNameOfFile FSharp.Compiler.ParseHelpers, [], [],
       [SynModuleOrNamespaceSig
          ([FSharp; Compiler; ParseHelpers], false, NamedModule,
@@ -16,7 +16,7 @@ SigFile
                              LongIdent (SynLongIdent ([obj], [], [None])), false,
                              PreXmlDoc ((4,25), FSharp.Compiler.Xml.XmlDocCollector),
                              None,
-                             /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,25--4,28),
+                             /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,25--4,28),
                              { LeadingKeyword = None });
                           SynField
                             ([], false, Some range,
@@ -24,32 +24,32 @@ SigFile
                              false,
                              PreXmlDoc ((4,31), FSharp.Compiler.Xml.XmlDocCollector),
                              None,
-                             /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,31--4,43),
+                             /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,31--4,43),
                              { LeadingKeyword = None })], PreXmlDocEmpty, None,
-                       /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,10--4,43),
+                       /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,10--4,43),
                        { BarRange = None }), None,
                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                    /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,0--4,43)),
+                    /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,0--4,43)),
                  Some
-                   /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,44--4,48),
+                   /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,44--4,48),
                  [Member
                     (SynValSig
                        ([], SynIdent (Meh, None), SynValTyparDecls (None, true),
                         Fun
                           (LongIdent (SynLongIdent ([string], [], [None])),
                            LongIdent (SynLongIdent ([int], [], [None])),
-                           /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,17--5,30),
+                           /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,17--5,30),
                            { ArrowRange =
-                              /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,24--5,26) }),
+                              /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,24--5,26) }),
                         SynValInfo
                           ([[SynArgInfo ([], false, None)]],
                            SynArgInfo ([], false, None)), false, false,
                         PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                         None, None,
-                        /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,4--5,30),
+                        /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,4--5,30),
                         { LeadingKeyword =
                            Member
-                             /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,4--5,10)
+                             /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,4--5,10)
                           InlineKeyword = None
                           WithKeyword = None
                           EqualsRange = None }),
@@ -59,22 +59,22 @@ SigFile
                        IsFinal = false
                        GetterOrSetterIsCompilerGenerated = false
                        MemberKind = Member },
-                     /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,4--5,30),
+                     /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (5,4--5,30),
                      { GetSetKeywords = None })],
-                 /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,0--5,30)),
-              /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,0--5,30));
+                 /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,0--5,30)),
+              /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (4,0--5,30));
            Open
              (ModuleOrNamespace
                 (SynLongIdent ([Foo], [], [None]),
-                 /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (7,5--7,8)),
-              /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (7,0--7,8))],
+                 /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (7,5--7,8)),
+              /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (7,0--7,8))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [],
           Some
             (Internal
-               /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (2,7--2,15)),
-          /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (2,0--7,8),
+               /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (2,7--2,15)),
+          /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (2,0--7,8),
           { LeadingKeyword =
              Module
-               /root/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (2,0--2,6) })],
+               /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
similarity index 59%
rename from tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
index 5741b0536e0..a8bfdf5d39a 100644
--- a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi",
+     ("/root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi",
       QualifiedNameOfFile RangeOfSynTypeDefnSigDelegateOfShouldStartFromName, [],
       [],
       [SynModuleOrNamespaceSig
@@ -11,15 +11,15 @@ SigFile
                     ([], None, [], [MyFunction],
                      PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,5--3,15)),
+                     /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,5--3,15)),
                   ObjectModel
                     (Delegate
                        (Fun
                           (LongIdent (SynLongIdent ([int], [], [None])),
                            LongIdent (SynLongIdent ([string], [], [None])),
-                           /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,16--4,29),
+                           /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,16--4,29),
                            { ArrowRange =
-                              /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,20--4,22) }),
+                              /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,20--4,22) }),
                         SynValInfo
                           ([[SynArgInfo ([], false, None)]],
                            SynArgInfo ([], false, None))),
@@ -30,14 +30,14 @@ SigFile
                             Fun
                               (LongIdent (SynLongIdent ([int], [], [None])),
                                LongIdent (SynLongIdent ([string], [], [None])),
-                               /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,16--4,29),
+                               /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,16--4,29),
                                { ArrowRange =
-                                  /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,20--4,22) }),
+                                  /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,20--4,22) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]],
                                SynArgInfo ([], false, None)), false, false,
                             PreXmlDocEmpty, None, None,
-                            /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,4--4,29),
+                            /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,4--4,29),
                             { LeadingKeyword = Synthetic
                               InlineKeyword = None
                               WithKeyword = None
@@ -48,23 +48,23 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,4--4,29),
+                         /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,4--4,29),
                          { GetSetKeywords = None })],
-                     /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,4--4,29)),
+                     /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (4,4--4,29)),
                   [],
-                  /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,5--4,29),
+                  /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,5--4,29),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,0--3,4)
+                       /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,0--3,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,16--3,17)
+                       /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,16--3,17)
                     WithKeyword = None })],
-              /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,0--4,29))],
+              /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (3,0--4,29))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,0--4,29),
+          /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,0--4,29),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,0--2,9) })],
+               /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
similarity index 57%
rename from tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
index 3ecd8606f49..caf461db3e9 100644
--- a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi",
+     ("/root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi",
       QualifiedNameOfFile RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember,
       [], [],
       [SynModuleOrNamespaceSig
@@ -11,10 +11,10 @@ SigFile
                     ([], None, [], [MyRecord],
                      PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,5--3,13)),
+                     /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,5--3,13)),
                   ObjectModel
                     (Class, [],
-                     /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (4,4--5,7)),
+                     /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (4,4--5,7)),
                   [Member
                      (SynValSig
                         ([], SynIdent (Score, None),
@@ -22,18 +22,18 @@ SigFile
                          Fun
                            (LongIdent (SynLongIdent ([unit], [], [None])),
                             LongIdent (SynLongIdent ([int], [], [None])),
-                            /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,19--6,30),
+                            /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,19--6,30),
                             { ArrowRange =
-                               /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,24--6,26) }),
+                               /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,24--6,26) }),
                          SynValInfo
                            ([[SynArgInfo ([], false, None)]],
                             SynArgInfo ([], false, None)), false, false,
                          PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None, None,
-                         /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,4--6,30),
+                         /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,4--6,30),
                          { LeadingKeyword =
                             Member
-                              /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,4--6,10)
+                              /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,4--6,10)
                            InlineKeyword = None
                            WithKeyword = None
                            EqualsRange = None }),
@@ -43,21 +43,21 @@ SigFile
                         IsFinal = false
                         GetterOrSetterIsCompilerGenerated = false
                         MemberKind = Member },
-                      /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,4--6,30),
+                      /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (6,4--6,30),
                       { GetSetKeywords = None })],
-                  /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,5--6,30),
+                  /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,5--6,30),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,0--3,4)
+                       /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,0--3,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,14--3,15)
+                       /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,14--3,15)
                     WithKeyword = None })],
-              /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,0--6,30))],
+              /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (3,0--6,30))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,0--6,30),
+          /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,0--6,30),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,0--2,9) })],
+               /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
similarity index 58%
rename from tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
index da7ce65bfe1..e94bab3d665 100644
--- a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi",
+     ("/root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi",
       QualifiedNameOfFile RangeOfSynTypeDefnSigRecordShouldEndAtLastMember, [],
       [],
       [SynModuleOrNamespaceSig
@@ -11,7 +11,7 @@ SigFile
                     ([], None, [], [MyRecord],
                      PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,5--3,13)),
+                     /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,5--3,13)),
                   Simple
                     (Record
                        (None,
@@ -20,10 +20,10 @@ SigFile
                             LongIdent (SynLongIdent ([int], [], [None])), false,
                             PreXmlDoc ((4,6), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,6--4,16),
+                            /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,6--4,16),
                             { LeadingKeyword = None })],
-                        /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,4--4,18)),
-                     /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,4--4,18)),
+                        /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,4--4,18)),
+                     /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (4,4--4,18)),
                   [Member
                      (SynValSig
                         ([], SynIdent (Score, None),
@@ -31,18 +31,18 @@ SigFile
                          Fun
                            (LongIdent (SynLongIdent ([unit], [], [None])),
                             LongIdent (SynLongIdent ([int], [], [None])),
-                            /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,19--5,30),
+                            /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,19--5,30),
                             { ArrowRange =
-                               /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,24--5,26) }),
+                               /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,24--5,26) }),
                          SynValInfo
                            ([[SynArgInfo ([], false, None)]],
                             SynArgInfo ([], false, None)), false, false,
                          PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None, None,
-                         /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,4--5,30),
+                         /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,4--5,30),
                          { LeadingKeyword =
                             Member
-                              /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,4--5,10)
+                              /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,4--5,10)
                            InlineKeyword = None
                            WithKeyword = None
                            EqualsRange = None }),
@@ -52,21 +52,21 @@ SigFile
                         IsFinal = false
                         GetterOrSetterIsCompilerGenerated = false
                         MemberKind = Member },
-                      /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,4--5,30),
+                      /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (5,4--5,30),
                       { GetSetKeywords = None })],
-                  /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,5--5,30),
+                  /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,5--5,30),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,0--3,4)
+                       /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,0--3,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,14--3,15)
+                       /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,14--3,15)
                     WithKeyword = None })],
-              /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,0--5,30))],
+              /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (3,0--5,30))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,0--5,30),
+          /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,0--5,30),
           { LeadingKeyword =
              Namespace
-               /root/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,0--2,9) })],
+               /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi
diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
new file mode 100644
index 00000000000..79d6dcf40e8
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
@@ -0,0 +1,63 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi",
+      QualifiedNameOfFile RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal, [], [],
+      [SynModuleOrNamespaceSig
+         ([Z], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [SomeCollection],
+                     PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,5--3,19)),
+                  Simple
+                    (None
+                       /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,5--5,37),
+                     /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,5--5,37)),
+                  [ValField
+                     (SynField
+                        ([], false, Some LastIndex,
+                         LongIdent (SynLongIdent ([int], [], [None])), false,
+                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None,
+                         /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,23),
+                         { LeadingKeyword =
+                            Some
+                              (Val
+                                 /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,7)) }),
+                      /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (4,4--4,23));
+                   ValField
+                     (SynField
+                        ([], false, Some SomeThingElse,
+                         Fun
+                           (LongIdent (SynLongIdent ([int], [], [None])),
+                            LongIdent (SynLongIdent ([string], [], [None])),
+                            /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,24--5,37),
+                            { ArrowRange =
+                               /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,28--5,30) }),
+                         false,
+                         PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                         None,
+                         /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,4--5,37),
+                         { LeadingKeyword =
+                            Some
+                              (Val
+                                 /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,4--5,7)) }),
+                      /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (5,4--5,37))],
+                  /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,5--5,37),
+                  { LeadingKeyword =
+                     Type
+                       /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,0--3,4)
+                    EqualsRange = None
+                    WithKeyword =
+                     Some
+                       /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,20--3,24) })],
+              /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (3,0--5,37))],
+          PreXmlDocEmpty, [], None,
+          /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,0--5,37),
+          { LeadingKeyword =
+             Namespace
+               /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,0--2,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi b/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfTypeShouldEndAtEndKeyword.fsi
rename to tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi
diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
new file mode 100644
index 00000000000..6766b16ec50
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
@@ -0,0 +1,36 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi",
+      QualifiedNameOfFile RangeOfTypeShouldEndAtEndKeyword, [], [],
+      [SynModuleOrNamespaceSig
+         ([GreatProjectThing], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Meh],
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi (4,5--4,8)),
+                  ObjectModel
+                    (Class, [],
+                     /root/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi (5,8--6,11)),
+                  [],
+                  /root/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi (4,5--6,11),
+                  { LeadingKeyword =
+                     Type
+                       /root/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi (4,0--4,4)
+                    EqualsRange =
+                     Some
+                       /root/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi (4,9--4,10)
+                    WithKeyword = None })],
+              /root/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi (4,0--6,11))],
+          PreXmlDocEmpty, [], None,
+          /root/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi (2,0--6,11),
+          { LeadingKeyword =
+             Namespace
+               /root/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi (2,0--2,9) })],
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi (9,0--9,6)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi b/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi
rename to tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi
diff --git a/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
similarity index 57%
rename from tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
index ba24aa55c3b..fee9619b4bc 100644
--- a/tests/service/data/SyntaxTree/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi",
+     ("/root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi",
       QualifiedNameOfFile SynExceptionSigShouldContainsTheRangeOfTheWithKeyword,
       [], [],
       [SynModuleOrNamespaceSig
@@ -11,30 +11,30 @@ SigFile
                    ([],
                     SynUnionCase
                       ([], SynIdent (Foo, None), Fields [], PreXmlDocEmpty, None,
-                       /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,10--4,13),
+                       /root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,10--4,13),
                        { BarRange = None }), None,
                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                    /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,13)),
+                    /root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,13)),
                  Some
-                   /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,14--4,18),
+                   /root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,14--4,18),
                  [Member
                     (SynValSig
                        ([], SynIdent (Meh, None), SynValTyparDecls (None, true),
                         Fun
                           (LongIdent (SynLongIdent ([unit], [], [None])),
                            LongIdent (SynLongIdent ([unit], [], [None])),
-                           /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,13--5,25),
+                           /root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,13--5,25),
                            { ArrowRange =
-                              /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,18--5,20) }),
+                              /root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,18--5,20) }),
                         SynValInfo
                           ([[SynArgInfo ([], false, None)]],
                            SynArgInfo ([], false, None)), false, false,
                         PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                         None, None,
-                        /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,25),
+                        /root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,25),
                         { LeadingKeyword =
                            Member
-                             /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,6)
+                             /root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,6)
                           InlineKeyword = None
                           WithKeyword = None
                           EqualsRange = None }),
@@ -44,14 +44,14 @@ SigFile
                        IsFinal = false
                        GetterOrSetterIsCompilerGenerated = false
                        MemberKind = Member },
-                     /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,25),
+                     /root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,25),
                      { GetSetKeywords = None })],
-                 /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--5,25)),
-              /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--5,25))],
+                 /root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--5,25)),
+              /root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--5,25))],
           PreXmlDocEmpty, [], None,
-          /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--5,25),
+          /root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--5,25),
           { LeadingKeyword =
              Namespace
-               /root/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--2,9) })],
+               /root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi
rename to tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
index 33c95954c16..9d5e4b248d0 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi",
+     ("/root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi",
       QualifiedNameOfFile SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword,
       [], [],
       [SynModuleOrNamespaceSig
@@ -11,29 +11,29 @@ SigFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--4,8)),
+                     /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--4,8)),
                   Simple
                     (None
-                       /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--5,25),
-                     /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--5,25)),
+                       /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--5,25),
+                     /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--5,25)),
                   [Member
                      (SynValSig
                         ([], SynIdent (Meh, None), SynValTyparDecls (None, true),
                          Fun
                            (LongIdent (SynLongIdent ([unit], [], [None])),
                             LongIdent (SynLongIdent ([unit], [], [None])),
-                            /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,13--5,25),
+                            /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,13--5,25),
                             { ArrowRange =
-                               /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,18--5,20) }),
+                               /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,18--5,20) }),
                          SynValInfo
                            ([[SynArgInfo ([], false, None)]],
                             SynArgInfo ([], false, None)), false, false,
                          PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                          None, None,
-                         /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,25),
+                         /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,25),
                          { LeadingKeyword =
                             Member
-                              /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,6)
+                              /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,6)
                            InlineKeyword = None
                            WithKeyword = None
                            EqualsRange = None }),
@@ -43,21 +43,21 @@ SigFile
                         IsFinal = false
                         GetterOrSetterIsCompilerGenerated = false
                         MemberKind = Member },
-                      /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,25),
+                      /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (5,0--5,25),
                       { GetSetKeywords = None })],
-                  /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--5,25),
+                  /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,5--5,25),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,4)
+                       /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--4,4)
                     EqualsRange = None
                     WithKeyword =
                      Some
-                       /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,9--4,13) })],
-              /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--5,25))],
+                       /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,9--4,13) })],
+              /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (4,0--5,25))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--5,25),
+          /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--5,25),
           { LeadingKeyword =
              Namespace
-               /root/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--2,9) })],
+               /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi
rename to tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi
diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
new file mode 100644
index 00000000000..ada0314afea
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -0,0 +1,59 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi",
+      QualifiedNameOfFile SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign,
+      [], [],
+      [SynModuleOrNamespaceSig
+         ([SomeNamespace], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Bear],
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,5--4,9)),
+                  Simple
+                    (Enum
+                       ([SynEnumCase
+                           ([], SynIdent (BlackBear, None),
+                            Const
+                              (Int32 1,
+                               /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,18--5,19)),
+                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,6--5,19),
+                            { BarRange =
+                               Some
+                                 /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,4--5,5)
+                              EqualsRange =
+                               /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,16--5,17) });
+                         SynEnumCase
+                           ([], SynIdent (PolarBear, None),
+                            Const
+                              (Int32 2,
+                               /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (6,18--6,19)),
+                            PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (6,6--6,19),
+                            { BarRange =
+                               Some
+                                 /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (6,4--6,5)
+                              EqualsRange =
+                               /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (6,16--6,17) })],
+                        /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,4--6,19)),
+                     /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,4--6,19)),
+                  [],
+                  /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,5--6,19),
+                  { LeadingKeyword =
+                     Type
+                       /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,0--4,4)
+                    EqualsRange =
+                     Some
+                       /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,10--4,11)
+                    WithKeyword = None })],
+              /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,0--6,19))],
+          PreXmlDocEmpty, [], None,
+          /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (2,0--6,19),
+          { LeadingKeyword =
+             Namespace
+               /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi
rename to tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi
diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
new file mode 100644
index 00000000000..166ca5cd134
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -0,0 +1,35 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi",
+      QualifiedNameOfFile
+        SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign, [],
+      [],
+      [SynModuleOrNamespaceSig
+         ([SomeNamespace], false, DeclaredNamespace,
+          [Types
+             ([SynTypeDefnSig
+                 (SynComponentInfo
+                    ([], None, [], [Foobar],
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,5--4,11)),
+                  ObjectModel
+                    (Class, [],
+                     /root/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (5,4--6,7)),
+                  [],
+                  /root/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,5--6,7),
+                  { LeadingKeyword =
+                     Type
+                       /root/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,0--4,4)
+                    EqualsRange =
+                     Some
+                       /root/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,12--4,13)
+                    WithKeyword = None })],
+              /root/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,0--6,7))],
+          PreXmlDocEmpty, [], None,
+          /root/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (2,0--6,7),
+          { LeadingKeyword =
+             Namespace
+               /root/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi
rename to tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
similarity index 56%
rename from tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
index 1b0a82deb13..0e5d6eaeba1 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi",
+     ("/root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi",
       QualifiedNameOfFile
         SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign, [],
       [],
@@ -12,15 +12,15 @@ SigFile
                     ([], None, [], [X],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,5--4,6)),
+                     /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,5--4,6)),
                   ObjectModel
                     (Delegate
                        (Fun
                           (LongIdent (SynLongIdent ([string], [], [None])),
                            LongIdent (SynLongIdent ([string], [], [None])),
-                           /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,21--4,37),
+                           /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,21--4,37),
                            { ArrowRange =
-                              /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,28--4,30) }),
+                              /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,28--4,30) }),
                         SynValInfo
                           ([[SynArgInfo ([], false, None)]],
                            SynArgInfo ([], false, None))),
@@ -31,14 +31,14 @@ SigFile
                             Fun
                               (LongIdent (SynLongIdent ([string], [], [None])),
                                LongIdent (SynLongIdent ([string], [], [None])),
-                               /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,21--4,37),
+                               /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,21--4,37),
                                { ArrowRange =
-                                  /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,28--4,30) }),
+                                  /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,28--4,30) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]],
                                SynArgInfo ([], false, None)), false, false,
                             PreXmlDocEmpty, None, None,
-                            /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,9--4,37),
+                            /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,9--4,37),
                             { LeadingKeyword = Synthetic
                               InlineKeyword = None
                               WithKeyword = None
@@ -49,23 +49,23 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,9--4,37),
+                         /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,9--4,37),
                          { GetSetKeywords = None })],
-                     /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,9--4,37)),
+                     /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,9--4,37)),
                   [],
-                  /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,5--4,37),
+                  /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,5--4,37),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,0--4,4)
+                       /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,7--4,8)
+                       /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,0--4,37))],
+              /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (4,0--4,37))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (2,0--4,37),
+          /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (2,0--4,37),
           { LeadingKeyword =
              Namespace
-               /root/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
+               /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi
rename to tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
similarity index 58%
rename from tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
index a0fb12976f6..8a2c9af80a3 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi",
+     ("/root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi",
       QualifiedNameOfFile SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign,
       [], [],
       [SynModuleOrNamespaceSig
@@ -11,7 +11,7 @@ SigFile
                     ([], None, [], [Shape],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,5--4,10)),
+                     /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,5--4,10)),
                   Simple
                     (Union
                        (None,
@@ -24,14 +24,14 @@ SigFile
                                   false,
                                   PreXmlDoc ((5,12), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,12--5,15),
+                                  /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,12--5,15),
                                   { LeadingKeyword = None })],
                             PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,2--5,15),
+                            /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,2--5,15),
                             { BarRange =
                                Some
-                                 /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,0--5,1) });
+                                 /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,0--5,1) });
                          SynUnionCase
                            ([], SynIdent (Rectangle, None),
                             Fields
@@ -41,7 +41,7 @@ SigFile
                                   false,
                                   PreXmlDoc ((6,15), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (6,15--6,18),
+                                  /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (6,15--6,18),
                                   { LeadingKeyword = None });
                                SynField
                                  ([], false, None,
@@ -49,30 +49,30 @@ SigFile
                                   false,
                                   PreXmlDoc ((6,21), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (6,21--6,24),
+                                  /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (6,21--6,24),
                                   { LeadingKeyword = None })],
                             PreXmlDoc ((6,0), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (6,2--6,24),
+                            /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (6,2--6,24),
                             { BarRange =
                                Some
-                                 /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (6,0--6,1) })],
-                        /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,0--6,24)),
-                     /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,0--6,24)),
+                                 /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (6,0--6,1) })],
+                        /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,0--6,24)),
+                     /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (5,0--6,24)),
                   [],
-                  /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,5--6,24),
+                  /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,5--6,24),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,0--4,4)
+                       /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,11--4,12)
+                       /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,11--4,12)
                     WithKeyword = None })],
-              /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,0--6,24))],
+              /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (4,0--6,24))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (2,0--6,24),
+          /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (2,0--6,24),
           { LeadingKeyword =
              Namespace
-               /root/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
+               /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi b/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi
rename to tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi
diff --git a/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl
similarity index 59%
rename from tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl
index ee7926108ad..a6c5cec0a12 100644
--- a/tests/service/data/SyntaxTree/SynValSigContainsParameterNames.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl
@@ -1,7 +1,7 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/SynValSigContainsParameterNames.fsi", QualifiedNameOfFile Meh, [],
-      [],
+     ("/root/SignatureType/SynValSigContainsParameterNames.fsi",
+      QualifiedNameOfFile Meh, [], [],
       [SynModuleOrNamespaceSig
          ([Meh], false, NamedModule,
           [Val
@@ -20,10 +20,10 @@ SigFile
                                  [LongIdent
                                     (SynLongIdent ([SynMemberFlags], [], [None]))],
                                  [], None, true,
-                                 /root/SynValSigContainsParameterNames.fsi (4,20--4,41)),
-                              /root/SynValSigContainsParameterNames.fsi (4,4--4,41)));
+                                 /root/SignatureType/SynValSigContainsParameterNames.fsi (4,20--4,41)),
+                              /root/SignatureType/SynValSigContainsParameterNames.fsi (4,4--4,41)));
                         Star
-                          /root/SynValSigContainsParameterNames.fsi (4,42--4,43);
+                          /root/SignatureType/SynValSigContainsParameterNames.fsi (4,42--4,43);
                         Type
                           (SignatureParameter
                              ([], false, Some pat,
@@ -33,10 +33,10 @@ SigFile
                                  [LongIdent
                                     (SynLongIdent ([SynPat], [], [None]))], [],
                                  None, true,
-                                 /root/SynValSigContainsParameterNames.fsi (4,49--4,62)),
-                              /root/SynValSigContainsParameterNames.fsi (4,44--4,62)));
+                                 /root/SignatureType/SynValSigContainsParameterNames.fsi (4,49--4,62)),
+                              /root/SignatureType/SynValSigContainsParameterNames.fsi (4,44--4,62)));
                         Star
-                          /root/SynValSigContainsParameterNames.fsi (4,63--4,64);
+                          /root/SignatureType/SynValSigContainsParameterNames.fsi (4,63--4,64);
                         Type
                           (App
                              (LongIdent (SynLongIdent ([option], [], [None])),
@@ -44,27 +44,27 @@ SigFile
                               [LongIdent
                                  (SynLongIdent ([SynReturnInfo], [], [None]))],
                               [], None, true,
-                              /root/SynValSigContainsParameterNames.fsi (4,65--4,85)));
+                              /root/SignatureType/SynValSigContainsParameterNames.fsi (4,65--4,85)));
                         Star
-                          /root/SynValSigContainsParameterNames.fsi (4,86--4,87);
+                          /root/SignatureType/SynValSigContainsParameterNames.fsi (4,86--4,87);
                         Type
                           (SignatureParameter
                              ([], false, Some origRhsExpr,
                               LongIdent (SynLongIdent ([SynExpr], [], [None])),
-                              /root/SynValSigContainsParameterNames.fsi (4,88--4,108)))],
-                       /root/SynValSigContainsParameterNames.fsi (4,4--4,108)),
+                              /root/SignatureType/SynValSigContainsParameterNames.fsi (4,88--4,108)))],
+                       /root/SignatureType/SynValSigContainsParameterNames.fsi (4,4--4,108)),
                     Fun
                       (SignatureParameter
                          ([], false, Some x,
                           LongIdent (SynLongIdent ([string], [], [None])),
-                          /root/SynValSigContainsParameterNames.fsi (5,8--5,17)),
+                          /root/SignatureType/SynValSigContainsParameterNames.fsi (5,8--5,17)),
                        LongIdent (SynLongIdent ([SynValData2], [], [None])),
-                       /root/SynValSigContainsParameterNames.fsi (5,8--6,23),
+                       /root/SignatureType/SynValSigContainsParameterNames.fsi (5,8--6,23),
                        { ArrowRange =
-                          /root/SynValSigContainsParameterNames.fsi (5,18--5,20) }),
-                    /root/SynValSigContainsParameterNames.fsi (4,4--6,23),
+                          /root/SignatureType/SynValSigContainsParameterNames.fsi (5,18--5,20) }),
+                    /root/SignatureType/SynValSigContainsParameterNames.fsi (4,4--6,23),
                     { ArrowRange =
-                       /root/SynValSigContainsParameterNames.fsi (4,109--4,111) }),
+                       /root/SignatureType/SynValSigContainsParameterNames.fsi (4,109--4,111) }),
                  SynValInfo
                    ([[SynArgInfo ([], false, Some memberFlagsOpt);
                       SynArgInfo ([], false, Some pat);
@@ -73,16 +73,19 @@ SigFile
                      [SynArgInfo ([], false, Some x)]],
                     SynArgInfo ([], false, None)), false, false,
                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 None, /root/SynValSigContainsParameterNames.fsi (3,0--6,23),
+                 None,
+                 /root/SignatureType/SynValSigContainsParameterNames.fsi (3,0--6,23),
                  { LeadingKeyword =
-                    Val /root/SynValSigContainsParameterNames.fsi (3,0--3,3)
+                    Val
+                      /root/SignatureType/SynValSigContainsParameterNames.fsi (3,0--3,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/SynValSigContainsParameterNames.fsi (3,0--6,23))],
+              /root/SignatureType/SynValSigContainsParameterNames.fsi (3,0--6,23))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/SynValSigContainsParameterNames.fsi (2,0--6,23),
+          /root/SignatureType/SynValSigContainsParameterNames.fsi (2,0--6,23),
           { LeadingKeyword =
-             Module /root/SynValSigContainsParameterNames.fsi (2,0--2,6) })],
+             Module
+               /root/SignatureType/SynValSigContainsParameterNames.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi b/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi
rename to tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi
diff --git a/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
index e27c467fe0c..20230e04965 100644
--- a/tests/service/data/SyntaxTree/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
@@ -1,7 +1,7 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/TriviaIsPresentInSynTypeDefnSig.fsi", QualifiedNameOfFile Meh, [],
-      [],
+     ("/root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi",
+      QualifiedNameOfFile Meh, [], [],
       [SynModuleOrNamespaceSig
          ([Meh], false, NamedModule,
           [Types
@@ -10,7 +10,7 @@ SigFile
                     ([], None, [], [X],
                      PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,5--4,6)),
+                     /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (4,5--4,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -25,81 +25,87 @@ SigFile
                             Some
                               (Const
                                  (Int32 10,
-                                  /root/TriviaIsPresentInSynTypeDefnSig.fsi (5,21--5,23))),
-                            /root/TriviaIsPresentInSynTypeDefnSig.fsi (5,4--5,23),
+                                  /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (5,21--5,23))),
+                            /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (5,4--5,23),
                             { LeadingKeyword =
                                Member
-                                 /root/TriviaIsPresentInSynTypeDefnSig.fsi (5,4--5,10)
+                                 /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (5,4--5,10)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange =
                                Some
-                                 /root/TriviaIsPresentInSynTypeDefnSig.fsi (5,19--5,20) }),
+                                 /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (5,19--5,20) }),
                          { IsInstance = true
                            IsDispatchSlot = false
                            IsOverrideOrExplicitImpl = false
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = PropertyGet },
-                         /root/TriviaIsPresentInSynTypeDefnSig.fsi (5,4--5,23),
+                         /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (5,4--5,23),
                          { GetSetKeywords = None })],
-                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (5,4--5,23)), [],
-                  /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,5--5,23),
+                     /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (5,4--5,23)),
+                  [],
+                  /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (4,5--5,23),
                   { LeadingKeyword =
-                     Type /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,0--4,4)
+                     Type
+                       /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (4,0--4,4)
                     EqualsRange =
-                     Some /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,7--4,8)
+                     Some
+                       /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (4,7--4,8)
                     WithKeyword = None })],
-              /root/TriviaIsPresentInSynTypeDefnSig.fsi (4,0--5,23));
+              /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (4,0--5,23));
            Types
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Y],
                      PreXmlDoc ((11,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (11,5--11,6)),
+                     /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (11,5--11,6)),
                   Simple
                     (TypeAbbrev
                        (Ok, LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/TriviaIsPresentInSynTypeDefnSig.fsi (11,9--11,12)),
-                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (11,9--11,12)),
-                  [], /root/TriviaIsPresentInSynTypeDefnSig.fsi (7,0--11,12),
+                        /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (11,9--11,12)),
+                     /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (11,9--11,12)),
+                  [],
+                  /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (7,0--11,12),
                   { LeadingKeyword =
-                     Type /root/TriviaIsPresentInSynTypeDefnSig.fsi (11,0--11,4)
+                     Type
+                       /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (11,0--11,4)
                     EqualsRange =
-                     Some /root/TriviaIsPresentInSynTypeDefnSig.fsi (11,7--11,8)
+                     Some
+                       /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (11,7--11,8)
                     WithKeyword = None })],
-              /root/TriviaIsPresentInSynTypeDefnSig.fsi (7,0--11,12));
+              /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (7,0--11,12));
            Types
              ([SynTypeDefnSig
                  (SynComponentInfo
                     ([], None, [], [Z],
                      PreXmlDoc ((14,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,5--14,6)),
+                     /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (14,5--14,6)),
                   Simple
                     (None
-                       /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,5--15,32),
-                     /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,5--15,32)),
+                       /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (14,5--15,32),
+                     /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (14,5--15,32)),
                   [Member
                      (SynValSig
                         ([], SynIdent (P, None), SynValTyparDecls (None, true),
                          Fun
                            (LongIdent (SynLongIdent ([int], [], [None])),
                             LongIdent (SynLongIdent ([int], [], [None])),
-                            /root/TriviaIsPresentInSynTypeDefnSig.fsi (15,22--15,32),
+                            /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (15,22--15,32),
                             { ArrowRange =
-                               /root/TriviaIsPresentInSynTypeDefnSig.fsi (15,26--15,28) }),
+                               /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (15,26--15,28) }),
                          SynValInfo
                            ([[SynArgInfo ([], false, None)]],
                             SynArgInfo ([], false, None)), false, false,
                          PreXmlDoc ((15,4), FSharp.Compiler.Xml.XmlDocCollector),
                          None, None,
-                         /root/TriviaIsPresentInSynTypeDefnSig.fsi (15,4--15,32),
+                         /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (15,4--15,32),
                          { LeadingKeyword =
                             StaticMember
-                              (/root/TriviaIsPresentInSynTypeDefnSig.fsi (15,4--15,10),
-                               /root/TriviaIsPresentInSynTypeDefnSig.fsi (15,11--15,17))
+                              (/root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (15,4--15,10),
+                               /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (15,11--15,17))
                            InlineKeyword = None
                            WithKeyword = None
                            EqualsRange = None }),
@@ -109,24 +115,28 @@ SigFile
                         IsFinal = false
                         GetterOrSetterIsCompilerGenerated = false
                         MemberKind = Member },
-                      /root/TriviaIsPresentInSynTypeDefnSig.fsi (15,4--15,32),
+                      /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (15,4--15,32),
                       { GetSetKeywords = None })],
-                  /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,5--15,32),
+                  /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (14,5--15,32),
                   { LeadingKeyword =
-                     Type /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,0--14,4)
+                     Type
+                       /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (14,0--14,4)
                     EqualsRange = None
                     WithKeyword =
                      Some
-                       /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,7--14,11) })],
-              /root/TriviaIsPresentInSynTypeDefnSig.fsi (14,0--15,32))],
+                       /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (14,7--14,11) })],
+              /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (14,0--15,32))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/TriviaIsPresentInSynTypeDefnSig.fsi (2,0--15,32),
+          /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (2,0--15,32),
           { LeadingKeyword =
-             Module /root/TriviaIsPresentInSynTypeDefnSig.fsi (2,0--2,6) })],
+             Module
+               /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (2,0--2,6) })],
       { ConditionalDirectives =
          [If
             (Ident "CHECK_LINE0_TYPES",
-             /root/TriviaIsPresentInSynTypeDefnSig.fsi (8,0--8,21));
-          Else /root/TriviaIsPresentInSynTypeDefnSig.fsi (10,0--10,5);
-          EndIf /root/TriviaIsPresentInSynTypeDefnSig.fsi (12,0--12,6)]
+             /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (8,0--8,21));
+          Else
+            /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (10,0--10,5);
+          EndIf
+            /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (12,0--12,6)]
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi b/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi
rename to tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi
diff --git a/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl
similarity index 51%
rename from tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi.bsl
rename to tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl
index facf462b12f..f929741142c 100644
--- a/tests/service/data/SyntaxTree/ValKeywordIsPresentInSynValSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl
@@ -1,7 +1,7 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/ValKeywordIsPresentInSynValSig.fsi", QualifiedNameOfFile Meh, [],
-      [],
+     ("/root/SignatureType/ValKeywordIsPresentInSynValSig.fsi",
+      QualifiedNameOfFile Meh, [], [],
       [SynModuleOrNamespaceSig
          ([Meh], false, NamedModule,
           [Val
@@ -11,28 +11,33 @@ SigFile
                         ArgExpr =
                          Const
                            (Unit,
-                            /root/ValKeywordIsPresentInSynValSig.fsi (4,2--4,5))
+                            /root/SignatureType/ValKeywordIsPresentInSynValSig.fsi (4,2--4,5))
                         Target = None
                         AppliesToGetterAndSetter = false
                         Range =
-                         /root/ValKeywordIsPresentInSynValSig.fsi (4,2--4,5) }]
-                    Range = /root/ValKeywordIsPresentInSynValSig.fsi (4,0--4,7) }],
+                         /root/SignatureType/ValKeywordIsPresentInSynValSig.fsi (4,2--4,5) }]
+                    Range =
+                     /root/SignatureType/ValKeywordIsPresentInSynValSig.fsi (4,0--4,7) }],
                  SynIdent (a, None), SynValTyparDecls (None, true),
                  LongIdent (SynLongIdent ([int], [], [None])),
                  SynValInfo ([], SynArgInfo ([], false, None)), false, false,
                  PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 None, /root/ValKeywordIsPresentInSynValSig.fsi (4,0--6,11),
+                 None,
+                 /root/SignatureType/ValKeywordIsPresentInSynValSig.fsi (4,0--6,11),
                  { LeadingKeyword =
-                    Val /root/ValKeywordIsPresentInSynValSig.fsi (6,0--6,3)
+                    Val
+                      /root/SignatureType/ValKeywordIsPresentInSynValSig.fsi (6,0--6,3)
                    InlineKeyword = None
                    WithKeyword = None
                    EqualsRange = None }),
-              /root/ValKeywordIsPresentInSynValSig.fsi (4,0--6,11))],
+              /root/SignatureType/ValKeywordIsPresentInSynValSig.fsi (4,0--6,11))],
           PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
-          /root/ValKeywordIsPresentInSynValSig.fsi (2,0--6,11),
+          /root/SignatureType/ValKeywordIsPresentInSynValSig.fsi (2,0--6,11),
           { LeadingKeyword =
-             Module /root/ValKeywordIsPresentInSynValSig.fsi (2,0--2,6) })],
+             Module
+               /root/SignatureType/ValKeywordIsPresentInSynValSig.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
         CodeComments =
-         [LineComment /root/ValKeywordIsPresentInSynValSig.fsi (5,0--5,6)] },
+         [LineComment
+            /root/SignatureType/ValKeywordIsPresentInSynValSig.fsi (5,0--5,6)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs.bsl
deleted file mode 100644
index 01a70e5a10b..00000000000
--- a/tests/service/data/SyntaxTree/SimpleLambdaHasArrowRange.fs.bsl
+++ /dev/null
@@ -1,26 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SimpleLambdaHasArrowRange.fs", false,
-      QualifiedNameOfFile SimpleLambdaHasArrowRange, [], [],
-      [SynModuleOrNamespace
-         ([SimpleLambdaHasArrowRange], false, AnonModule,
-          [Expr
-             (Lambda
-                (false, false,
-                 SimplePats
-                   ([Id
-                       (x, None, false, false, false,
-                        /root/SimpleLambdaHasArrowRange.fs (2,4--2,5))],
-                    /root/SimpleLambdaHasArrowRange.fs (2,4--2,5)), Ident x,
-                 Some
-                   ([Named
-                       (SynIdent (x, None), false, None,
-                        /root/SimpleLambdaHasArrowRange.fs (2,4--2,5))], Ident x),
-                 /root/SimpleLambdaHasArrowRange.fs (2,0--2,10),
-                 { ArrowRange =
-                    Some /root/SimpleLambdaHasArrowRange.fs (2,6--2,8) }),
-              /root/SimpleLambdaHasArrowRange.fs (2,0--2,10))], PreXmlDocEmpty,
-          [], None, /root/SimpleLambdaHasArrowRange.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi.bsl
deleted file mode 100644
index 2bfc733669f..00000000000
--- a/tests/service/data/SyntaxTree/SingleIfElseEndif,SignatureFile.fsi.bsl
+++ /dev/null
@@ -1,35 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/SingleIfElseEndif,SignatureFile.fsi",
-      QualifiedNameOfFile SingleIfElseEndif,SignatureFile, [], [],
-      [SynModuleOrNamespaceSig
-         ([Foobar], false, DeclaredNamespace,
-          [Val
-             (SynValSig
-                ([], SynIdent (v, None), SynValTyparDecls (None, true),
-                 LongIdent (SynLongIdent ([int], [], [None])),
-                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 Some
-                   (Const
-                      (Int32 42,
-                       /root/SingleIfElseEndif,SignatureFile.fsi (8,4--8,6))),
-                 /root/SingleIfElseEndif,SignatureFile.fsi (4,0--8,6),
-                 { LeadingKeyword =
-                    Val /root/SingleIfElseEndif,SignatureFile.fsi (4,0--4,3)
-                   InlineKeyword = None
-                   WithKeyword = None
-                   EqualsRange =
-                    Some /root/SingleIfElseEndif,SignatureFile.fsi (4,12--4,13) }),
-              /root/SingleIfElseEndif,SignatureFile.fsi (4,0--8,6))],
-          PreXmlDocEmpty, [], None,
-          /root/SingleIfElseEndif,SignatureFile.fsi (2,0--8,6),
-          { LeadingKeyword =
-             Namespace /root/SingleIfElseEndif,SignatureFile.fsi (2,0--2,9) })],
-      { ConditionalDirectives =
-         [If
-            (Ident "DEBUG",
-             /root/SingleIfElseEndif,SignatureFile.fsi (5,4--5,13));
-          Else /root/SingleIfElseEndif,SignatureFile.fsi (7,4--7,9);
-          EndIf /root/SingleIfElseEndif,SignatureFile.fsi (9,4--9,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/SingleIfElseEndif.fs.bsl
deleted file mode 100644
index dff1066ca32..00000000000
--- a/tests/service/data/SyntaxTree/SingleIfElseEndif.fs.bsl
+++ /dev/null
@@ -1,30 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SingleIfElseEndif.fs", false, QualifiedNameOfFile SingleIfElseEndif,
-      [], [],
-      [SynModuleOrNamespace
-         ([SingleIfElseEndif], false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (v, None), false, None,
-                     /root/SingleIfElseEndif.fs (2,4--2,5)), None,
-                  Const (Int32 42, /root/SingleIfElseEndif.fs (6,4--6,6)),
-                  /root/SingleIfElseEndif.fs (2,4--2,5),
-                  Yes /root/SingleIfElseEndif.fs (2,0--6,6),
-                  { LeadingKeyword = Let /root/SingleIfElseEndif.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange = Some /root/SingleIfElseEndif.fs (2,6--2,7) })],
-              /root/SingleIfElseEndif.fs (2,0--6,6))], PreXmlDocEmpty, [], None,
-          /root/SingleIfElseEndif.fs (2,0--8,0), { LeadingKeyword = None })],
-      (true, false),
-      { ConditionalDirectives =
-         [If (Ident "DEBUG", /root/SingleIfElseEndif.fs (3,4--3,13));
-          Else /root/SingleIfElseEndif.fs (5,4--5,9);
-          EndIf /root/SingleIfElseEndif.fs (7,4--7,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi.bsl
deleted file mode 100644
index 458b0dbfacc..00000000000
--- a/tests/service/data/SyntaxTree/SingleIfEndif,SignatureFile.fsi.bsl
+++ /dev/null
@@ -1,31 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/SingleIfEndif,SignatureFile.fsi",
-      QualifiedNameOfFile SingleIfEndif,SignatureFile, [], [],
-      [SynModuleOrNamespaceSig
-         ([Foobar], false, DeclaredNamespace,
-          [Val
-             (SynValSig
-                ([], SynIdent (v, None), SynValTyparDecls (None, true),
-                 LongIdent (SynLongIdent ([int], [], [None])),
-                 SynValInfo ([], SynArgInfo ([], false, None)), false, false,
-                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
-                 Some
-                   (Const
-                      (Int32 42,
-                       /root/SingleIfEndif,SignatureFile.fsi (8,4--8,6))),
-                 /root/SingleIfEndif,SignatureFile.fsi (4,0--8,6),
-                 { LeadingKeyword =
-                    Val /root/SingleIfEndif,SignatureFile.fsi (4,0--4,3)
-                   InlineKeyword = None
-                   WithKeyword = None
-                   EqualsRange =
-                    Some /root/SingleIfEndif,SignatureFile.fsi (4,11--4,12) }),
-              /root/SingleIfEndif,SignatureFile.fsi (4,0--8,6))], PreXmlDocEmpty,
-          [], None, /root/SingleIfEndif,SignatureFile.fsi (2,0--8,6),
-          { LeadingKeyword =
-             Namespace /root/SingleIfEndif,SignatureFile.fsi (2,0--2,9) })],
-      { ConditionalDirectives =
-         [If (Ident "DEBUG", /root/SingleIfEndif,SignatureFile.fsi (5,4--5,13));
-          EndIf /root/SingleIfEndif,SignatureFile.fsi (7,4--7,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleIfEndif.fs.bsl b/tests/service/data/SyntaxTree/SingleIfEndif.fs.bsl
deleted file mode 100644
index 0bdfc3e9862..00000000000
--- a/tests/service/data/SyntaxTree/SingleIfEndif.fs.bsl
+++ /dev/null
@@ -1,28 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SingleIfEndif.fs", false, QualifiedNameOfFile SingleIfEndif, [], [],
-      [SynModuleOrNamespace
-         ([SingleIfEndif], false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (v, None), false, None,
-                     /root/SingleIfEndif.fs (2,4--2,5)), None,
-                  Const (Int32 42, /root/SingleIfEndif.fs (6,4--6,6)),
-                  /root/SingleIfEndif.fs (2,4--2,5),
-                  Yes /root/SingleIfEndif.fs (2,0--6,6),
-                  { LeadingKeyword = Let /root/SingleIfEndif.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange = Some /root/SingleIfEndif.fs (2,6--2,7) })],
-              /root/SingleIfEndif.fs (2,0--6,6))], PreXmlDocEmpty, [], None,
-          /root/SingleIfEndif.fs (2,0--7,0), { LeadingKeyword = None })],
-      (true, false),
-      { ConditionalDirectives =
-         [If (Ident "DEBUG", /root/SingleIfEndif.fs (3,4--3,13));
-          EndIf /root/SingleIfEndif.fs (5,4--5,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs.bsl b/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs.bsl
deleted file mode 100644
index 55599128538..00000000000
--- a/tests/service/data/SyntaxTree/SingleSynEnumCaseHasBarRange.fs.bsl
+++ /dev/null
@@ -1,41 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SingleSynEnumCaseHasBarRange.fs", false,
-      QualifiedNameOfFile SingleSynEnumCaseHasBarRange, [], [],
-      [SynModuleOrNamespace
-         ([SingleSynEnumCaseHasBarRange], false, AnonModule,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [Foo],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/SingleSynEnumCaseHasBarRange.fs (2,5--2,8)),
-                  Simple
-                    (Enum
-                       ([SynEnumCase
-                           ([], SynIdent (Bar, None),
-                            Const
-                              (Int32 1,
-                               /root/SingleSynEnumCaseHasBarRange.fs (2,19--2,20)),
-                            PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SingleSynEnumCaseHasBarRange.fs (2,13--2,20),
-                            { BarRange =
-                               Some
-                                 /root/SingleSynEnumCaseHasBarRange.fs (2,11--2,12)
-                              EqualsRange =
-                               /root/SingleSynEnumCaseHasBarRange.fs (2,17--2,18) })],
-                        /root/SingleSynEnumCaseHasBarRange.fs (2,11--2,20)),
-                     /root/SingleSynEnumCaseHasBarRange.fs (2,11--2,20)), [],
-                  None, /root/SingleSynEnumCaseHasBarRange.fs (2,5--2,20),
-                  { LeadingKeyword =
-                     Type /root/SingleSynEnumCaseHasBarRange.fs (2,0--2,4)
-                    EqualsRange =
-                     Some /root/SingleSynEnumCaseHasBarRange.fs (2,9--2,10)
-                    WithKeyword = None })],
-              /root/SingleSynEnumCaseHasBarRange.fs (2,0--2,20))],
-          PreXmlDocEmpty, [], None,
-          /root/SingleSynEnumCaseHasBarRange.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs.bsl b/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs.bsl
deleted file mode 100644
index 38b5d31fce3..00000000000
--- a/tests/service/data/SyntaxTree/SingleSynEnumCaseWithoutBar.fs.bsl
+++ /dev/null
@@ -1,38 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SingleSynEnumCaseWithoutBar.fs", false,
-      QualifiedNameOfFile SingleSynEnumCaseWithoutBar, [], [],
-      [SynModuleOrNamespace
-         ([SingleSynEnumCaseWithoutBar], false, AnonModule,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [Foo],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/SingleSynEnumCaseWithoutBar.fs (2,5--2,8)),
-                  Simple
-                    (Enum
-                       ([SynEnumCase
-                           ([], SynIdent (Bar, None),
-                            Const
-                              (Int32 1,
-                               /root/SingleSynEnumCaseWithoutBar.fs (2,17--2,18)),
-                            PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SingleSynEnumCaseWithoutBar.fs (2,11--2,18),
-                            { BarRange = None
-                              EqualsRange =
-                               /root/SingleSynEnumCaseWithoutBar.fs (2,15--2,16) })],
-                        /root/SingleSynEnumCaseWithoutBar.fs (2,11--2,18)),
-                     /root/SingleSynEnumCaseWithoutBar.fs (2,11--2,18)), [],
-                  None, /root/SingleSynEnumCaseWithoutBar.fs (2,5--2,18),
-                  { LeadingKeyword =
-                     Type /root/SingleSynEnumCaseWithoutBar.fs (2,0--2,4)
-                    EqualsRange =
-                     Some /root/SingleSynEnumCaseWithoutBar.fs (2,9--2,10)
-                    WithKeyword = None })],
-              /root/SingleSynEnumCaseWithoutBar.fs (2,0--2,18))], PreXmlDocEmpty,
-          [], None, /root/SingleSynEnumCaseWithoutBar.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_LINE_.fs b/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/_LINE_.fs
rename to tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs
diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl
new file mode 100644
index 00000000000..ad1250bd595
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl
@@ -0,0 +1,16 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SourceIdentifier/_LINE_.fs", false, QualifiedNameOfFile _LINE_, [],
+      [],
+      [SynModuleOrNamespace
+         ([_LINE_], false, AnonModule,
+          [Expr
+             (Const
+                (SourceIdentifier
+                   ("__LINE__", "2", /root/SourceIdentifier/_LINE_.fs (2,0--2,8)),
+                 /root/SourceIdentifier/_LINE_.fs (2,0--2,8)),
+              /root/SourceIdentifier/_LINE_.fs (2,0--2,8))], PreXmlDocEmpty, [],
+          None, /root/SourceIdentifier/_LINE_.fs (2,0--2,8),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs
rename to tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs
diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl
new file mode 100644
index 00000000000..27a9e24a612
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl
@@ -0,0 +1,18 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SourceIdentifier/_SOURCEDIRECTORY_.fs", false,
+      QualifiedNameOfFile _SOURCEDIRECTORY_, [], [],
+      [SynModuleOrNamespace
+         ([_SOURCEDIRECTORY_], false, AnonModule,
+          [Expr
+             (Const
+                (SourceIdentifier
+                   ("__SOURCE_DIRECTORY__", "C:\root\SourceIdentifier",
+                    /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (2,0--2,20)),
+                 /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (2,0--2,20)),
+              /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (2,0--2,20))],
+          PreXmlDocEmpty, [], None,
+          /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (2,0--2,20),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_SOURCEFILE_.fs b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/_SOURCEFILE_.fs
rename to tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs
diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl
new file mode 100644
index 00000000000..d563efde7c1
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl
@@ -0,0 +1,18 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SourceIdentifier/_SOURCEFILE_.fs", false,
+      QualifiedNameOfFile _SOURCEFILE_, [], [],
+      [SynModuleOrNamespace
+         ([_SOURCEFILE_], false, AnonModule,
+          [Expr
+             (Const
+                (SourceIdentifier
+                   ("__SOURCE_FILE__", "_SOURCEFILE_.fs",
+                    /root/SourceIdentifier/_SOURCEFILE_.fs (2,0--2,15)),
+                 /root/SourceIdentifier/_SOURCEFILE_.fs (2,0--2,15)),
+              /root/SourceIdentifier/_SOURCEFILE_.fs (2,0--2,15))],
+          PreXmlDocEmpty, [], None,
+          /root/SourceIdentifier/_SOURCEFILE_.fs (2,0--2,15),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
deleted file mode 100644
index 31bbd6ef8bc..00000000000
--- a/tests/service/data/SyntaxTree/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
+++ /dev/null
@@ -1,19 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SourceIdentifierAsParsedHashDirectiveArgument.fs", false,
-      QualifiedNameOfFile SourceIdentifierAsParsedHashDirectiveArgument, [], [],
-      [SynModuleOrNamespace
-         ([SourceIdentifierAsParsedHashDirectiveArgument], false, AnonModule,
-          [HashDirective
-             (ParsedHashDirective
-                ("I",
-                 [SourceIdentifier
-                    ("__SOURCE_DIRECTORY__", "C:\root",
-                     /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,3--2,23))],
-                 /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23)),
-              /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23))],
-          PreXmlDocEmpty, [], None,
-          /root/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticLetKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticLetKeyword.fs.bsl
deleted file mode 100644
index b12b590146e..00000000000
--- a/tests/service/data/SyntaxTree/StaticLetKeyword.fs.bsl
+++ /dev/null
@@ -1,48 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/StaticLetKeyword.fs", false, QualifiedNameOfFile StaticLetKeyword,
-      [], [],
-      [SynModuleOrNamespace
-         ([StaticLetKeyword], false, AnonModule,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [X],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/StaticLetKeyword.fs (2,5--2,6)),
-                  ObjectModel
-                    (Unspecified,
-                     [LetBindings
-                        ([SynBinding
-                            (None, Normal, false, false, [],
-                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                             SynValData
-                               (None,
-                                SynValInfo ([], SynArgInfo ([], false, None)),
-                                None),
-                             LongIdent
-                               (SynLongIdent ([PI], [], [None]), None, None,
-                                Pats [], None,
-                                /root/StaticLetKeyword.fs (3,15--3,17)), None,
-                             Const
-                               (Double 3.14,
-                                /root/StaticLetKeyword.fs (3,20--3,24)),
-                             /root/StaticLetKeyword.fs (3,15--3,17),
-                             Yes /root/StaticLetKeyword.fs (3,11--3,24),
-                             { LeadingKeyword =
-                                StaticLet
-                                  (/root/StaticLetKeyword.fs (3,4--3,10),
-                                   /root/StaticLetKeyword.fs (3,11--3,14))
-                               InlineKeyword = None
-                               EqualsRange =
-                                Some /root/StaticLetKeyword.fs (3,18--3,19) })],
-                         true, false, /root/StaticLetKeyword.fs (3,4--3,24))],
-                     /root/StaticLetKeyword.fs (3,4--3,24)), [], None,
-                  /root/StaticLetKeyword.fs (2,5--3,24),
-                  { LeadingKeyword = Type /root/StaticLetKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/StaticLetKeyword.fs (2,7--2,8)
-                    WithKeyword = None })],
-              /root/StaticLetKeyword.fs (2,0--3,24))], PreXmlDocEmpty, [], None,
-          /root/StaticLetKeyword.fs (2,0--4,0), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs.bsl
deleted file mode 100644
index ca27758c4a3..00000000000
--- a/tests/service/data/SyntaxTree/StaticLetRecKeyword.fs.bsl
+++ /dev/null
@@ -1,60 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/StaticLetRecKeyword.fs", false,
-      QualifiedNameOfFile StaticLetRecKeyword, [], [],
-      [SynModuleOrNamespace
-         ([StaticLetRecKeyword], false, AnonModule,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [X],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/StaticLetRecKeyword.fs (2,5--2,6)),
-                  ObjectModel
-                    (Unspecified,
-                     [LetBindings
-                        ([SynBinding
-                            (None, Normal, false, false, [],
-                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                             SynValData
-                               (None,
-                                SynValInfo ([[]], SynArgInfo ([], false, None)),
-                                None),
-                             LongIdent
-                               (SynLongIdent ([forever], [], [None]), None, None,
-                                Pats
-                                  [Paren
-                                     (Const
-                                        (Unit,
-                                         /root/StaticLetRecKeyword.fs (3,27--3,29)),
-                                      /root/StaticLetRecKeyword.fs (3,27--3,29))],
-                                None, /root/StaticLetRecKeyword.fs (3,19--3,29)),
-                             None,
-                             App
-                               (Atomic, false, Ident forever,
-                                Const
-                                  (Unit,
-                                   /root/StaticLetRecKeyword.fs (3,39--3,41)),
-                                /root/StaticLetRecKeyword.fs (3,32--3,41)),
-                             /root/StaticLetRecKeyword.fs (3,19--3,29),
-                             NoneAtLet,
-                             { LeadingKeyword =
-                                StaticLetRec
-                                  (/root/StaticLetRecKeyword.fs (3,4--3,10),
-                                   /root/StaticLetRecKeyword.fs (3,11--3,14),
-                                   /root/StaticLetRecKeyword.fs (3,15--3,18))
-                               InlineKeyword = None
-                               EqualsRange =
-                                Some /root/StaticLetRecKeyword.fs (3,30--3,31) })],
-                         true, true, /root/StaticLetRecKeyword.fs (3,4--3,41))],
-                     /root/StaticLetRecKeyword.fs (3,4--3,41)), [], None,
-                  /root/StaticLetRecKeyword.fs (2,5--3,41),
-                  { LeadingKeyword =
-                     Type /root/StaticLetRecKeyword.fs (2,0--2,4)
-                    EqualsRange = Some /root/StaticLetRecKeyword.fs (2,7--2,8)
-                    WithKeyword = None })],
-              /root/StaticLetRecKeyword.fs (2,0--3,41))], PreXmlDocEmpty, [],
-          None, /root/StaticLetRecKeyword.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/StaticValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/StaticValKeyword.fsi.bsl
deleted file mode 100644
index 26804fb80d6..00000000000
--- a/tests/service/data/SyntaxTree/StaticValKeyword.fsi.bsl
+++ /dev/null
@@ -1,41 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/StaticValKeyword.fsi", QualifiedNameOfFile StaticValKeyword, [], [],
-      [SynModuleOrNamespaceSig
-         ([Meh], false, DeclaredNamespace,
-          [Types
-             ([SynTypeDefnSig
-                 (SynComponentInfo
-                    ([], None, [], [X],
-                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/StaticValKeyword.fsi (4,5--4,6)),
-                  ObjectModel
-                    (Unspecified,
-                     [ValField
-                        (SynField
-                           ([], true, Some Y,
-                            Fun
-                              (LongIdent (SynLongIdent ([int], [], [None])),
-                               LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/StaticValKeyword.fsi (5,19--5,29),
-                               { ArrowRange =
-                                  /root/StaticValKeyword.fsi (5,23--5,25) }),
-                            false,
-                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            None, /root/StaticValKeyword.fsi (5,4--5,29),
-                            { LeadingKeyword =
-                               Some
-                                 (StaticVal
-                                    (/root/StaticValKeyword.fsi (5,4--5,10),
-                                     /root/StaticValKeyword.fsi (5,11--5,14))) }),
-                         /root/StaticValKeyword.fsi (5,4--5,29))],
-                     /root/StaticValKeyword.fsi (5,4--5,29)), [],
-                  /root/StaticValKeyword.fsi (4,5--5,29),
-                  { LeadingKeyword = Type /root/StaticValKeyword.fsi (4,0--4,4)
-                    EqualsRange = Some /root/StaticValKeyword.fsi (4,7--4,8)
-                    WithKeyword = None })],
-              /root/StaticValKeyword.fsi (4,0--5,29))], PreXmlDocEmpty, [], None,
-          /root/StaticValKeyword.fsi (2,0--5,29),
-          { LeadingKeyword = Namespace /root/StaticValKeyword.fsi (2,0--2,9) })],
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs
rename to tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs
diff --git a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs.bsl
rename to tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl
index d84870b549d..012885fa39f 100644
--- a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindRegular.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynConstBytesWithSynByteStringKindRegular.fs", false,
+     ("/root/String/SynConstBytesWithSynByteStringKindRegular.fs", false,
       QualifiedNameOfFile SynConstBytesWithSynByteStringKindRegular, [], [],
       [SynModuleOrNamespace
          ([SynConstBytesWithSynByteStringKindRegular], false, AnonModule,
@@ -13,26 +13,26 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (bytes, None), false, None,
-                     /root/SynConstBytesWithSynByteStringKindRegular.fs (2,4--2,9)),
+                     /root/String/SynConstBytesWithSynByteStringKindRegular.fs (2,4--2,9)),
                   None,
                   Const
                     (Bytes
                        ([|121uy; 111uy|], Regular,
-                        /root/SynConstBytesWithSynByteStringKindRegular.fs (2,12--2,17)),
-                     /root/SynConstBytesWithSynByteStringKindRegular.fs (2,12--2,17)),
-                  /root/SynConstBytesWithSynByteStringKindRegular.fs (2,4--2,9),
+                        /root/String/SynConstBytesWithSynByteStringKindRegular.fs (2,12--2,17)),
+                     /root/String/SynConstBytesWithSynByteStringKindRegular.fs (2,12--2,17)),
+                  /root/String/SynConstBytesWithSynByteStringKindRegular.fs (2,4--2,9),
                   Yes
-                    /root/SynConstBytesWithSynByteStringKindRegular.fs (2,0--2,17),
+                    /root/String/SynConstBytesWithSynByteStringKindRegular.fs (2,0--2,17),
                   { LeadingKeyword =
                      Let
-                       /root/SynConstBytesWithSynByteStringKindRegular.fs (2,0--2,3)
+                       /root/String/SynConstBytesWithSynByteStringKindRegular.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynConstBytesWithSynByteStringKindRegular.fs (2,10--2,11) })],
-              /root/SynConstBytesWithSynByteStringKindRegular.fs (2,0--2,17))],
+                       /root/String/SynConstBytesWithSynByteStringKindRegular.fs (2,10--2,11) })],
+              /root/String/SynConstBytesWithSynByteStringKindRegular.fs (2,0--2,17))],
           PreXmlDocEmpty, [], None,
-          /root/SynConstBytesWithSynByteStringKindRegular.fs (2,0--3,0),
+          /root/String/SynConstBytesWithSynByteStringKindRegular.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs
rename to tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs
diff --git a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
rename to tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
index de7280c1814..55ef939a4fd 100644
--- a/tests/service/data/SyntaxTree/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynConstBytesWithSynByteStringKindVerbatim.fs", false,
+     ("/root/String/SynConstBytesWithSynByteStringKindVerbatim.fs", false,
       QualifiedNameOfFile SynConstBytesWithSynByteStringKindVerbatim, [], [],
       [SynModuleOrNamespace
          ([SynConstBytesWithSynByteStringKindVerbatim], false, AnonModule,
@@ -13,26 +13,26 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (bytes, None), false, None,
-                     /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,4--2,9)),
+                     /root/String/SynConstBytesWithSynByteStringKindVerbatim.fs (2,4--2,9)),
                   None,
                   Const
                     (Bytes
                        ([|121uy; 111uy|], Verbatim,
-                        /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,12--2,18)),
-                     /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,12--2,18)),
-                  /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,4--2,9),
+                        /root/String/SynConstBytesWithSynByteStringKindVerbatim.fs (2,12--2,18)),
+                     /root/String/SynConstBytesWithSynByteStringKindVerbatim.fs (2,12--2,18)),
+                  /root/String/SynConstBytesWithSynByteStringKindVerbatim.fs (2,4--2,9),
                   Yes
-                    /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,0--2,18),
+                    /root/String/SynConstBytesWithSynByteStringKindVerbatim.fs (2,0--2,18),
                   { LeadingKeyword =
                      Let
-                       /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,0--2,3)
+                       /root/String/SynConstBytesWithSynByteStringKindVerbatim.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,10--2,11) })],
-              /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,0--2,18))],
+                       /root/String/SynConstBytesWithSynByteStringKindVerbatim.fs (2,10--2,11) })],
+              /root/String/SynConstBytesWithSynByteStringKindVerbatim.fs (2,0--2,18))],
           PreXmlDocEmpty, [], None,
-          /root/SynConstBytesWithSynByteStringKindVerbatim.fs (2,0--3,0),
+          /root/String/SynConstBytesWithSynByteStringKindVerbatim.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs
rename to tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs.bsl
rename to tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl
index c9d2ce3452d..7f1223d846e 100644
--- a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindRegular.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynConstStringWithSynStringKindRegular.fs", false,
+     ("/root/String/SynConstStringWithSynStringKindRegular.fs", false,
       QualifiedNameOfFile SynConstStringWithSynStringKindRegular, [], [],
       [SynModuleOrNamespace
          ([SynConstStringWithSynStringKindRegular], false, AnonModule,
@@ -13,26 +13,26 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (s, None), false, None,
-                     /root/SynConstStringWithSynStringKindRegular.fs (2,4--2,5)),
+                     /root/String/SynConstStringWithSynStringKindRegular.fs (2,4--2,5)),
                   None,
                   Const
                     (String
                        ("yo", Regular,
-                        /root/SynConstStringWithSynStringKindRegular.fs (2,8--2,12)),
-                     /root/SynConstStringWithSynStringKindRegular.fs (2,8--2,12)),
-                  /root/SynConstStringWithSynStringKindRegular.fs (2,4--2,5),
+                        /root/String/SynConstStringWithSynStringKindRegular.fs (2,8--2,12)),
+                     /root/String/SynConstStringWithSynStringKindRegular.fs (2,8--2,12)),
+                  /root/String/SynConstStringWithSynStringKindRegular.fs (2,4--2,5),
                   Yes
-                    /root/SynConstStringWithSynStringKindRegular.fs (2,0--2,12),
+                    /root/String/SynConstStringWithSynStringKindRegular.fs (2,0--2,12),
                   { LeadingKeyword =
                      Let
-                       /root/SynConstStringWithSynStringKindRegular.fs (2,0--2,3)
+                       /root/String/SynConstStringWithSynStringKindRegular.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynConstStringWithSynStringKindRegular.fs (2,6--2,7) })],
-              /root/SynConstStringWithSynStringKindRegular.fs (2,0--2,12))],
+                       /root/String/SynConstStringWithSynStringKindRegular.fs (2,6--2,7) })],
+              /root/String/SynConstStringWithSynStringKindRegular.fs (2,0--2,12))],
           PreXmlDocEmpty, [], None,
-          /root/SynConstStringWithSynStringKindRegular.fs (2,0--3,0),
+          /root/String/SynConstStringWithSynStringKindRegular.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs
rename to tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl
similarity index 56%
rename from tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs.bsl
rename to tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl
index 163b7cfe131..fd78fdc258a 100644
--- a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindTripleQuote.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynConstStringWithSynStringKindTripleQuote.fs", false,
+     ("/root/String/SynConstStringWithSynStringKindTripleQuote.fs", false,
       QualifiedNameOfFile SynConstStringWithSynStringKindTripleQuote, [], [],
       [SynModuleOrNamespace
          ([SynConstStringWithSynStringKindTripleQuote], false, AnonModule,
@@ -13,24 +13,24 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (s, None), false, None,
-                     /root/SynConstStringWithSynStringKindTripleQuote.fs (2,4--2,5)),
+                     /root/String/SynConstStringWithSynStringKindTripleQuote.fs (2,4--2,5)),
                   None,
                   ArbitraryAfterError
                     ("localBinding1",
-                     /root/SynConstStringWithSynStringKindTripleQuote.fs (2,7--2,7)),
-                  /root/SynConstStringWithSynStringKindTripleQuote.fs (2,4--2,5),
+                     /root/String/SynConstStringWithSynStringKindTripleQuote.fs (2,7--2,7)),
+                  /root/String/SynConstStringWithSynStringKindTripleQuote.fs (2,4--2,5),
                   Yes
-                    /root/SynConstStringWithSynStringKindTripleQuote.fs (2,4--2,7),
+                    /root/String/SynConstStringWithSynStringKindTripleQuote.fs (2,4--2,7),
                   { LeadingKeyword =
                      Let
-                       /root/SynConstStringWithSynStringKindTripleQuote.fs (2,0--2,3)
+                       /root/String/SynConstStringWithSynStringKindTripleQuote.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynConstStringWithSynStringKindTripleQuote.fs (2,6--2,7) })],
-              /root/SynConstStringWithSynStringKindTripleQuote.fs (2,0--2,7))],
+                       /root/String/SynConstStringWithSynStringKindTripleQuote.fs (2,6--2,7) })],
+              /root/String/SynConstStringWithSynStringKindTripleQuote.fs (2,0--2,7))],
           PreXmlDocEmpty, [], None,
-          /root/SynConstStringWithSynStringKindTripleQuote.fs (2,0--3,0),
+          /root/String/SynConstStringWithSynStringKindTripleQuote.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs
rename to tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs
diff --git a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs.bsl
rename to tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl
index 80af08e4cea..7617bad6abc 100644
--- a/tests/service/data/SyntaxTree/SynConstStringWithSynStringKindVerbatim.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynConstStringWithSynStringKindVerbatim.fs", false,
+     ("/root/String/SynConstStringWithSynStringKindVerbatim.fs", false,
       QualifiedNameOfFile SynConstStringWithSynStringKindVerbatim, [], [],
       [SynModuleOrNamespace
          ([SynConstStringWithSynStringKindVerbatim], false, AnonModule,
@@ -13,26 +13,26 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (s, None), false, None,
-                     /root/SynConstStringWithSynStringKindVerbatim.fs (2,4--2,5)),
+                     /root/String/SynConstStringWithSynStringKindVerbatim.fs (2,4--2,5)),
                   None,
                   Const
                     (String
                        ("yo", Verbatim,
-                        /root/SynConstStringWithSynStringKindVerbatim.fs (2,8--2,13)),
-                     /root/SynConstStringWithSynStringKindVerbatim.fs (2,8--2,13)),
-                  /root/SynConstStringWithSynStringKindVerbatim.fs (2,4--2,5),
+                        /root/String/SynConstStringWithSynStringKindVerbatim.fs (2,8--2,13)),
+                     /root/String/SynConstStringWithSynStringKindVerbatim.fs (2,8--2,13)),
+                  /root/String/SynConstStringWithSynStringKindVerbatim.fs (2,4--2,5),
                   Yes
-                    /root/SynConstStringWithSynStringKindVerbatim.fs (2,0--2,13),
+                    /root/String/SynConstStringWithSynStringKindVerbatim.fs (2,0--2,13),
                   { LeadingKeyword =
                      Let
-                       /root/SynConstStringWithSynStringKindVerbatim.fs (2,0--2,3)
+                       /root/String/SynConstStringWithSynStringKindVerbatim.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynConstStringWithSynStringKindVerbatim.fs (2,6--2,7) })],
-              /root/SynConstStringWithSynStringKindVerbatim.fs (2,0--2,13))],
+                       /root/String/SynConstStringWithSynStringKindVerbatim.fs (2,6--2,7) })],
+              /root/String/SynConstStringWithSynStringKindVerbatim.fs (2,0--2,13))],
           PreXmlDocEmpty, [], None,
-          /root/SynConstStringWithSynStringKindVerbatim.fs (2,0--3,0),
+          /root/String/SynConstStringWithSynStringKindVerbatim.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs
rename to tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
rename to tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
index 86007622d0d..97f8d8a0e2d 100644
--- a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynExprInterpolatedStringWithSynStringKindRegular.fs", false,
+     ("/root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs", false,
       QualifiedNameOfFile SynExprInterpolatedStringWithSynStringKindRegular, [],
       [],
       [SynModuleOrNamespace
@@ -14,35 +14,35 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (s, None), false, None,
-                     /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,4--2,5)),
+                     /root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,4--2,5)),
                   None,
                   InterpolatedString
                     ([String
                         ("yo ",
-                         /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,8--2,14));
+                         /root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,8--2,14));
                       FillExpr
                         (Const
                            (Int32 42,
-                            /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,14--2,16)),
+                            /root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,14--2,16)),
                          None);
                       String
                         ("",
-                         /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,16--2,18))],
+                         /root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,16--2,18))],
                      Regular,
-                     /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,8--2,18)),
-                  /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,4--2,5),
+                     /root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,8--2,18)),
+                  /root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,4--2,5),
                   Yes
-                    /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,0--2,18),
+                    /root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,0--2,18),
                   { LeadingKeyword =
                      Let
-                       /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,0--2,3)
+                       /root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,6--2,7) })],
-              /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,0--2,18))],
+                       /root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,6--2,7) })],
+              /root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,0--2,18))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,0--3,0),
+          /root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs
rename to tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
rename to tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
index 535697ff1e5..d6e001b4456 100644
--- a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs", false,
+     ("/root/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs",
+      false,
       QualifiedNameOfFile SynExprInterpolatedStringWithSynStringKindTripleQuote,
       [], [],
       [SynModuleOrNamespace
@@ -15,24 +16,24 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (s, None), false, None,
-                     /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,4--2,5)),
+                     /root/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,4--2,5)),
                   None,
                   ArbitraryAfterError
                     ("localBinding1",
-                     /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,7--2,7)),
-                  /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,4--2,5),
+                     /root/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,7--2,7)),
+                  /root/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,4--2,5),
                   Yes
-                    /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,4--2,7),
+                    /root/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,4--2,7),
                   { LeadingKeyword =
                      Let
-                       /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,0--2,3)
+                       /root/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,6--2,7) })],
-              /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,0--2,7))],
+                       /root/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,6--2,7) })],
+              /root/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,0--2,7))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,0--3,0),
+          /root/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs
rename to tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs
diff --git a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
rename to tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
index dd89abf6bce..66623dcda74 100644
--- a/tests/service/data/SyntaxTree/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs", false,
+     ("/root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs",
+      false,
       QualifiedNameOfFile SynExprInterpolatedStringWithSynStringKindVerbatim, [],
       [],
       [SynModuleOrNamespace
@@ -15,35 +16,35 @@ ImplFile
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent (s, None), false, None,
-                     /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,4--2,5)),
+                     /root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,4--2,5)),
                   None,
                   InterpolatedString
                     ([String
                         ("Migrate notes of file "",
-                         /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,8--2,36));
+                         /root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,8--2,36));
                       FillExpr (Ident oldId, None);
                       String
                         ("" to new file "",
-                         /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,41--2,60));
+                         /root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,41--2,60));
                       FillExpr (Ident newId, None);
                       String
                         ("".",
-                         /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,65--2,70))],
+                         /root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,65--2,70))],
                      Verbatim,
-                     /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,8--2,70)),
-                  /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,4--2,5),
+                     /root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,8--2,70)),
+                  /root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,4--2,5),
                   Yes
-                    /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,0--2,70),
+                    /root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,0--2,70),
                   { LeadingKeyword =
                      Let
-                       /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,0--2,3)
+                       /root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
                      Some
-                       /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,6--2,7) })],
-              /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,0--2,70))],
+                       /root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,6--2,7) })],
+              /root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,0--2,70))],
           PreXmlDocEmpty, [], None,
-          /root/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,0--3,0),
+          /root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
deleted file mode 100644
index c052f94649b..00000000000
--- a/tests/service/data/SyntaxTree/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
+++ /dev/null
@@ -1,47 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs", false,
-      QualifiedNameOfFile SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign,
-      [], [],
-      [SynModuleOrNamespace
-         ([SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign], false,
-          AnonModule,
-          [Expr
-             (Match
-                (Yes
-                   /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--2,12),
-                 Ident x,
-                 [SynMatchClause
-                    (LongIdent
-                       (SynLongIdent ([X], [], [None]), None, None,
-                        NamePatPairs
-                          ([(Y,
-                             /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,7--3,8),
-                             Named
-                               (SynIdent (y, None), false, None,
-                                /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,9--3,10)))],
-                           /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,4--3,11),
-                           { ParenRange =
-                              /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,3--3,11) }),
-                        None,
-                        /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,2--3,11)),
-                     None, Ident y,
-                     /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,2--3,16),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,12--3,14)
-                       BarRange =
-                        Some
-                          /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (3,0--3,1) })],
-                 /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--3,16),
-                 { MatchKeyword =
-                    /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--2,5)
-                   WithKeyword =
-                    /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,8--2,12) }),
-              /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--3,16))],
-          PreXmlDocEmpty, [], None,
-          /root/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs.bsl
deleted file mode 100644
index e28ab295b11..00000000000
--- a/tests/service/data/SyntaxTree/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs.bsl
+++ /dev/null
@@ -1,58 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs", false,
-      QualifiedNameOfFile SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression,
-      [], [],
-      [SynModuleOrNamespace
-         ([SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression], false,
-          AnonModule,
-          [Expr
-             (App
-                (NonAtomic, false, Ident async,
-                 ComputationExpr
-                   (false,
-                    LetOrUseBang
-                      (Yes
-                         /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (3,4--3,24),
-                       false, true,
-                       Named
-                         (SynIdent (bar, None), false, None,
-                          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (3,9--3,12)),
-                       App
-                         (NonAtomic, false, Ident getBar,
-                          Const
-                            (Unit,
-                             /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (3,22--3,24)),
-                          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (3,15--3,24)),
-                       [SynExprAndBang
-                          (Yes
-                             /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (5,4--7,10),
-                           false, true,
-                           Named
-                             (SynIdent (foo, None), false, None,
-                              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (5,9--5,12)),
-                           App
-                             (NonAtomic, false, Ident getFoo,
-                              Const
-                                (Unit,
-                                 /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (5,22--5,24)),
-                              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (5,15--5,24)),
-                           /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (5,4--5,24),
-                           { EqualsRange =
-                              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (5,13--5,14)
-                             InKeyword = None })],
-                       YieldOrReturn
-                         ((false, true), Ident bar,
-                          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (7,4--7,14)),
-                       /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (3,4--7,14),
-                       { EqualsRange =
-                          Some
-                            /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (3,13--3,14) }),
-                    /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,6--8,1)),
-                 /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,0--8,1)),
-              /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,0--8,1))],
-          PreXmlDocEmpty, [], None,
-          /root/SynExprAndBangRangeStartsAtAnd!AndEndsAfterExpression.fs (2,0--8,1),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs.bsl
deleted file mode 100644
index 58b4fe52e4e..00000000000
--- a/tests/service/data/SyntaxTree/SynExprAnonRecdWithStructKeyword.fs.bsl
+++ /dev/null
@@ -1,26 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprAnonRecdWithStructKeyword.fs", false,
-      QualifiedNameOfFile SynExprAnonRecdWithStructKeyword, [], [],
-      [SynModuleOrNamespace
-         ([SynExprAnonRecdWithStructKeyword], false, AnonModule,
-          [Expr
-             (AnonRecd
-                (true, None,
-                 [(Foo,
-                   Some /root/SynExprAnonRecdWithStructKeyword.fs (3,11--3,12),
-                   Ident someValue)],
-                 /root/SynExprAnonRecdWithStructKeyword.fs (2,0--5,16)),
-              /root/SynExprAnonRecdWithStructKeyword.fs (2,0--5,16));
-           Expr
-             (AnonRecd
-                (true, None, [],
-                 /root/SynExprAnonRecdWithStructKeyword.fs (7,0--7,12)),
-              /root/SynExprAnonRecdWithStructKeyword.fs (7,0--7,12))],
-          PreXmlDocEmpty, [], None,
-          /root/SynExprAnonRecdWithStructKeyword.fs (2,0--7,12),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments =
-         [LineComment /root/SynExprAnonRecdWithStructKeyword.fs (4,4--4,11)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl b/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
deleted file mode 100644
index e1d13141db8..00000000000
--- a/tests/service/data/SyntaxTree/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
+++ /dev/null
@@ -1,37 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs",
-      false,
-      QualifiedNameOfFile
-        SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields, [], [],
-      [SynModuleOrNamespace
-         ([SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields], false,
-          AnonModule,
-          [Expr
-             (AnonRecd
-                (false, None,
-                 [(X,
-                   Some
-                     /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,5--2,6),
-                   Const
-                     (Int32 5,
-                      /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,7--2,8)));
-                  (Y,
-                   Some
-                     /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (3,8--3,9),
-                   Const
-                     (Int32 6,
-                      /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (3,10--3,11)));
-                  (Z,
-                   Some
-                     /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (4,12--4,13),
-                   Const
-                     (Int32 7,
-                      /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (4,14--4,15)))],
-                 /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,0--4,18)),
-              /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,0--4,18))],
-          PreXmlDocEmpty, [], None,
-          /root/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,0--4,18),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs.bsl b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs.bsl
deleted file mode 100644
index 5058fb8a389..00000000000
--- a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainIdent.fs.bsl
+++ /dev/null
@@ -1,16 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprDynamicDoesContainIdent.fs", false,
-      QualifiedNameOfFile SynExprDynamicDoesContainIdent, [], [],
-      [SynModuleOrNamespace
-         ([SynExprDynamicDoesContainIdent], false, AnonModule,
-          [Expr
-             (Dynamic
-                (Ident x, /root/SynExprDynamicDoesContainIdent.fs (2,1--2,2),
-                 Ident k, /root/SynExprDynamicDoesContainIdent.fs (2,0--2,3)),
-              /root/SynExprDynamicDoesContainIdent.fs (2,0--2,3))],
-          PreXmlDocEmpty, [], None,
-          /root/SynExprDynamicDoesContainIdent.fs (2,0--2,3),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs.bsl b/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs.bsl
deleted file mode 100644
index cfcb8820e2e..00000000000
--- a/tests/service/data/SyntaxTree/SynExprDynamicDoesContainParentheses.fs.bsl
+++ /dev/null
@@ -1,23 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprDynamicDoesContainParentheses.fs", false,
-      QualifiedNameOfFile SynExprDynamicDoesContainParentheses, [], [],
-      [SynModuleOrNamespace
-         ([SynExprDynamicDoesContainParentheses], false, AnonModule,
-          [Expr
-             (Dynamic
-                (Ident x,
-                 /root/SynExprDynamicDoesContainParentheses.fs (2,1--2,2),
-                 Paren
-                   (Ident g,
-                    /root/SynExprDynamicDoesContainParentheses.fs (2,2--2,3),
-                    Some
-                      /root/SynExprDynamicDoesContainParentheses.fs (2,4--2,5),
-                    /root/SynExprDynamicDoesContainParentheses.fs (2,2--2,5)),
-                 /root/SynExprDynamicDoesContainParentheses.fs (2,0--2,5)),
-              /root/SynExprDynamicDoesContainParentheses.fs (2,0--2,5))],
-          PreXmlDocEmpty, [], None,
-          /root/SynExprDynamicDoesContainParentheses.fs (2,0--2,5),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
deleted file mode 100644
index 4140d932023..00000000000
--- a/tests/service/data/SyntaxTree/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
+++ /dev/null
@@ -1,41 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprForContainsTheRangeOfTheEqualsSign.fs", false,
-      QualifiedNameOfFile SynExprForContainsTheRangeOfTheEqualsSign, [], [],
-      [SynModuleOrNamespace
-         ([SynExprForContainsTheRangeOfTheEqualsSign], false, AnonModule,
-          [Expr
-             (For
-                (Yes
-                   /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--2,3),
-                 Yes
-                   /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,10--2,12),
-                 i,
-                 Some
-                   /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,6--2,7),
-                 Const
-                   (Int32 1,
-                    /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,8--2,9)),
-                 true,
-                 Const
-                   (Int32 10,
-                    /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,13--2,15)),
-                 App
-                   (NonAtomic, false,
-                    App
-                      (NonAtomic, false, Ident printf,
-                       Const
-                         (String
-                            ("%d ", Regular,
-                             /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (3,7--3,12)),
-                          /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (3,7--3,12)),
-                       /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (3,0--3,12)),
-                    Ident i,
-                    /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (3,0--3,14)),
-                 /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--3,14)),
-              /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--3,14))],
-          PreXmlDocEmpty, [], None,
-          /root/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
deleted file mode 100644
index c0fdae9ce5a..00000000000
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
+++ /dev/null
@@ -1,56 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs", false,
-      QualifiedNameOfFile SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign, [],
-      [],
-      [SynModuleOrNamespace
-         ([SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign], false,
-          AnonModule,
-          [Expr
-             (App
-                (NonAtomic, false, Ident comp,
-                 ComputationExpr
-                   (false,
-                    LetOrUseBang
-                      (Yes
-                         /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,4--3,14),
-                       false, true,
-                       Named
-                         (SynIdent (x, None), false, None,
-                          /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,9--3,10)),
-                       Ident y,
-                       [SynExprAndBang
-                          (Yes
-                             /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,4--5,10),
-                           false, true,
-                           Named
-                             (SynIdent (z, None), false, None,
-                              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,9--4,10)),
-                           App
-                             (NonAtomic, false, Ident someFunction,
-                              Const
-                                (Unit,
-                                 /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,26--4,28)),
-                              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,13--4,28)),
-                           /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,4--4,28),
-                           { EqualsRange =
-                              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (4,11--4,12)
-                             InKeyword = None })],
-                       YieldOrReturn
-                         ((false, true),
-                          Const
-                            (Unit,
-                             /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (5,11--5,13)),
-                          /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (5,4--5,13)),
-                       /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,4--5,13),
-                       { EqualsRange =
-                          Some
-                            /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (3,11--3,12) }),
-                    /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,5--6,1)),
-                 /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,0--6,1)),
-              /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,0--6,1))],
-          PreXmlDocEmpty, [], None,
-          /root/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,0--6,1),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
deleted file mode 100644
index a81cd1e3be6..00000000000
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
+++ /dev/null
@@ -1,69 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs",
-      false,
-      QualifiedNameOfFile
-        SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword,
-      [], [],
-      [SynModuleOrNamespace
-         ([SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword],
-          false, AnonModule,
-          [Expr
-             (Do
-                (LetOrUse
-                   (false, false,
-                    [SynBinding
-                       (None, Normal, false, false, [],
-                        PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
-                        SynValData
-                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None),
-                        Named
-                          (SynIdent (e1, None), false, None,
-                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,4--3,6)),
-                        None,
-                        Downcast
-                          (Ident e,
-                           LongIdent
-                             (SynLongIdent
-                                ([Collections; DictionaryEntry],
-                                 [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,26--3,27)],
-                                 [None; None])),
-                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,9--3,42)),
-                        /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,4--3,6),
-                        Yes
-                          /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,0--3,42),
-                        { LeadingKeyword =
-                           Let
-                             /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,0--3,3)
-                          InlineKeyword = None
-                          EqualsRange =
-                           Some
-                             /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,7--3,8) })],
-                    Tuple
-                      (false,
-                       [LongIdent
-                          (false,
-                           SynLongIdent
-                             ([e1; Key],
-                              [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,2--4,3)],
-                              [None; None]), None,
-                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,0--4,6));
-                        LongIdent
-                          (false,
-                           SynLongIdent
-                             ([e1; Value],
-                              [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,10--4,11)],
-                              [None; None]), None,
-                           /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,8--4,16))],
-                       [/root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,6--4,7)],
-                       /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (4,0--4,16)),
-                    /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (3,0--4,16),
-                    { InKeyword = None }),
-                 /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--4,16)),
-              /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--4,16))],
-          PreXmlDocEmpty, [], None,
-          /root/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--5,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
deleted file mode 100644
index 9ae539242ba..00000000000
--- a/tests/service/data/SyntaxTree/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
+++ /dev/null
@@ -1,74 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs",
-      false,
-      QualifiedNameOfFile
-        SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword, [], [],
-      [SynModuleOrNamespace
-         ([SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword],
-          false, AnonModule,
-          [Expr
-             (Do
-                (LetOrUse
-                   (true, false,
-                    [SynBinding
-                       (None, Normal, false, false, [],
-                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                        SynValData
-                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None),
-                        Named
-                          (SynIdent (f, None), false, None,
-                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,12--3,13)),
-                        None,
-                        Const
-                          (Unit,
-                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,16--3,18)),
-                        /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,12--3,13),
-                        Yes
-                          /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,4--3,18),
-                        { LeadingKeyword =
-                           LetRec
-                             (/root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,4--3,7),
-                              /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,8--3,11))
-                          InlineKeyword = None
-                          EqualsRange =
-                           Some
-                             /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,14--3,15) });
-                     SynBinding
-                       (None, Normal, false, false, [],
-                        PreXmlDoc ((4,8), FSharp.Compiler.Xml.XmlDocCollector),
-                        SynValData
-                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None),
-                        Named
-                          (SynIdent (g, None), false, None,
-                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,8--4,9)),
-                        None,
-                        Const
-                          (Unit,
-                           /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,12--4,14)),
-                        /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,8--4,9),
-                        Yes
-                          /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,4--4,14),
-                        { LeadingKeyword =
-                           And
-                             /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,4--4,7)
-                          InlineKeyword = None
-                          EqualsRange =
-                           Some
-                             /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,10--4,11) })],
-                    Const
-                      (Unit,
-                       /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (5,4--5,6)),
-                    /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (3,4--5,6),
-                    { InKeyword =
-                       Some
-                         /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (4,15--4,17) }),
-                 /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,0--5,6)),
-              /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,0--5,6))],
-          PreXmlDocEmpty, [], None,
-          /root/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,0--6,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
deleted file mode 100644
index 9ac1fcca014..00000000000
--- a/tests/service/data/SyntaxTree/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
+++ /dev/null
@@ -1,37 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs", false,
-      QualifiedNameOfFile
-        SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword, [], [],
-      [SynModuleOrNamespace
-         ([SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword], false,
-          AnonModule,
-          [Expr
-             (MatchBang
-                (Yes
-                   /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,13),
-                 Ident x,
-                 [SynMatchClause
-                    (Named
-                       (SynIdent (y, None), false, None,
-                        /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (3,2--3,3)),
-                     None, Ident z,
-                     /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (3,2--3,8),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (3,4--3,6)
-                       BarRange =
-                        Some
-                          /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (3,0--3,1) })],
-                 /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--3,8),
-                 { MatchBangKeyword =
-                    /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,6)
-                   WithKeyword =
-                    /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,9--2,13) }),
-              /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--3,8))],
-          PreXmlDocEmpty, [], None,
-          /root/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
deleted file mode 100644
index 187bb2e5046..00000000000
--- a/tests/service/data/SyntaxTree/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
+++ /dev/null
@@ -1,37 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs", false,
-      QualifiedNameOfFile SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword,
-      [], [],
-      [SynModuleOrNamespace
-         ([SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword], false,
-          AnonModule,
-          [Expr
-             (Match
-                (Yes
-                   /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,12),
-                 Ident x,
-                 [SynMatchClause
-                    (Named
-                       (SynIdent (y, None), false, None,
-                        /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (3,2--3,3)),
-                     None, Ident z,
-                     /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (3,2--3,8),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (3,4--3,6)
-                       BarRange =
-                        Some
-                          /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (3,0--3,1) })],
-                 /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--3,8),
-                 { MatchKeyword =
-                    /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--2,5)
-                   WithKeyword =
-                    /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,8--2,12) }),
-              /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--3,8))],
-          PreXmlDocEmpty, [], None,
-          /root/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs.bsl b/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs.bsl
deleted file mode 100644
index 993577eb83c..00000000000
--- a/tests/service/data/SyntaxTree/SynExprSetWithSynExprDynamic.fs.bsl
+++ /dev/null
@@ -1,19 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprSetWithSynExprDynamic.fs", false,
-      QualifiedNameOfFile SynExprSetWithSynExprDynamic, [], [],
-      [SynModuleOrNamespace
-         ([SynExprSetWithSynExprDynamic], false, AnonModule,
-          [Expr
-             (Set
-                (Dynamic
-                   (Ident x, /root/SynExprSetWithSynExprDynamic.fs (2,1--2,2),
-                    Ident v, /root/SynExprSetWithSynExprDynamic.fs (2,0--2,3)),
-                 Const
-                   (Int32 2, /root/SynExprSetWithSynExprDynamic.fs (2,7--2,8)),
-                 /root/SynExprSetWithSynExprDynamic.fs (2,0--2,8)),
-              /root/SynExprSetWithSynExprDynamic.fs (2,0--2,8))], PreXmlDocEmpty,
-          [], None, /root/SynExprSetWithSynExprDynamic.fs (2,0--2,8),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
deleted file mode 100644
index 1b34c807b40..00000000000
--- a/tests/service/data/SyntaxTree/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
+++ /dev/null
@@ -1,29 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs", false,
-      QualifiedNameOfFile
-        SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword, [], [],
-      [SynModuleOrNamespace
-         ([SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword], false,
-          AnonModule,
-          [Expr
-             (TryFinally
-                (Ident x,
-                 Const
-                   (Unit,
-                    /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (5,0--5,2)),
-                 /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--5,2),
-                 Yes
-                   /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--2,3),
-                 Yes
-                   /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,7),
-                 { TryKeyword =
-                    /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--2,3)
-                   FinallyKeyword =
-                    /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,7) }),
-              /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--5,2))],
-          PreXmlDocEmpty, [], None,
-          /root/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--6,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
deleted file mode 100644
index 1af5dfe2cb3..00000000000
--- a/tests/service/data/SyntaxTree/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
+++ /dev/null
@@ -1,43 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs", false,
-      QualifiedNameOfFile SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword,
-      [], [],
-      [SynModuleOrNamespace
-         ([SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword], false,
-          AnonModule,
-          [Expr
-             (TryWith
-                (Ident x,
-                 [SynMatchClause
-                    (Named
-                       (SynIdent (ex, None), false, None,
-                        /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (5,2--5,4)),
-                     None, Ident y,
-                     /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (5,2--5,9),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (5,5--5,7)
-                       BarRange =
-                        Some
-                          /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (5,0--5,1) })],
-                 /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--5,9),
-                 Yes
-                   /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--2,3),
-                 Yes
-                   /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,4),
-                 { TryKeyword =
-                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--2,3)
-                   TryToWithRange =
-                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--4,4)
-                   WithKeyword =
-                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--4,4)
-                   WithToEndRange =
-                    /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (4,0--5,9) }),
-              /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--5,9))],
-          PreXmlDocEmpty, [], None,
-          /root/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--6,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/IncompleteLongIdent.fs b/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/IncompleteLongIdent.fs
rename to tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent.fs
diff --git a/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent.fs.bsl b/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent.fs.bsl
new file mode 100644
index 00000000000..aed18e91e1c
--- /dev/null
+++ b/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent.fs.bsl
@@ -0,0 +1,20 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/SynIdent/IncompleteLongIdent.fs", false, QualifiedNameOfFile Module,
+      [], [],
+      [SynModuleOrNamespace
+         ([Module], false, NamedModule,
+          [Expr
+             (LongIdent
+                (false,
+                 SynLongIdent
+                   ([A], [/root/SynIdent/IncompleteLongIdent.fs (4,1--4,2)],
+                    [None]), None,
+                 /root/SynIdent/IncompleteLongIdent.fs (4,0--4,2)),
+              /root/SynIdent/IncompleteLongIdent.fs (4,0--4,2))],
+          PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
+          /root/SynIdent/IncompleteLongIdent.fs (2,0--4,2),
+          { LeadingKeyword =
+             Module /root/SynIdent/IncompleteLongIdent.fs (2,0--2,6) })],
+      (true, false), { ConditionalDirectives = []
+                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs.bsl b/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs.bsl
deleted file mode 100644
index c65e050f89b..00000000000
--- a/tests/service/data/SyntaxTree/SynMeasureParenHasCorrectRange.fs.bsl
+++ /dev/null
@@ -1,37 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynMeasureParenHasCorrectRange.fs", false,
-      QualifiedNameOfFile SynMeasureParenHasCorrectRange, [], [],
-      [SynModuleOrNamespace
-         ([SynMeasureParenHasCorrectRange], false, AnonModule,
-          [Expr
-             (Const
-                (Measure
-                   (UInt32 40u,
-                    /root/SynMeasureParenHasCorrectRange.fs (2,0--2,3),
-                    Divide
-                      (Seq
-                         ([Named
-                             ([hr],
-                              /root/SynMeasureParenHasCorrectRange.fs (2,4--2,6))],
-                          /root/SynMeasureParenHasCorrectRange.fs (2,4--2,6)),
-                       Seq
-                         ([Paren
-                             (Seq
-                                ([Named
-                                    ([staff],
-                                     /root/SynMeasureParenHasCorrectRange.fs (2,10--2,15));
-                                  Named
-                                    ([weeks],
-                                     /root/SynMeasureParenHasCorrectRange.fs (2,16--2,21))],
-                                 /root/SynMeasureParenHasCorrectRange.fs (2,10--2,21)),
-                              /root/SynMeasureParenHasCorrectRange.fs (2,9--2,22))],
-                          /root/SynMeasureParenHasCorrectRange.fs (2,9--2,22)),
-                       /root/SynMeasureParenHasCorrectRange.fs (2,4--2,22))),
-                 /root/SynMeasureParenHasCorrectRange.fs (2,0--2,23)),
-              /root/SynMeasureParenHasCorrectRange.fs (2,0--2,23))],
-          PreXmlDocEmpty, [], None,
-          /root/SynMeasureParenHasCorrectRange.fs (2,0--2,23),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs.bsl b/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs.bsl
deleted file mode 100644
index 886f9a2c42a..00000000000
--- a/tests/service/data/SyntaxTree/SynPatOrContainsTheRangeOfTheBar.fs.bsl
+++ /dev/null
@@ -1,58 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynPatOrContainsTheRangeOfTheBar.fs", false,
-      QualifiedNameOfFile SynPatOrContainsTheRangeOfTheBar, [], [],
-      [SynModuleOrNamespace
-         ([SynPatOrContainsTheRangeOfTheBar], false, AnonModule,
-          [Expr
-             (Match
-                (Yes /root/SynPatOrContainsTheRangeOfTheBar.fs (2,0--2,12),
-                 Ident x,
-                 [SynMatchClause
-                    (Or
-                       (LongIdent
-                          (SynLongIdent ([A], [], [None]), None, None, Pats [],
-                           None,
-                           /root/SynPatOrContainsTheRangeOfTheBar.fs (3,2--3,3)),
-                        LongIdent
-                          (SynLongIdent ([B], [], [None]), None, None, Pats [],
-                           None,
-                           /root/SynPatOrContainsTheRangeOfTheBar.fs (4,2--4,3)),
-                        /root/SynPatOrContainsTheRangeOfTheBar.fs (3,2--4,3),
-                        { BarRange =
-                           /root/SynPatOrContainsTheRangeOfTheBar.fs (4,0--4,1) }),
-                     None,
-                     Const
-                       (Unit,
-                        /root/SynPatOrContainsTheRangeOfTheBar.fs (4,7--4,9)),
-                     /root/SynPatOrContainsTheRangeOfTheBar.fs (3,2--4,9), Yes,
-                     { ArrowRange =
-                        Some
-                          /root/SynPatOrContainsTheRangeOfTheBar.fs (4,4--4,6)
-                       BarRange =
-                        Some
-                          /root/SynPatOrContainsTheRangeOfTheBar.fs (3,0--3,1) });
-                  SynMatchClause
-                    (Wild /root/SynPatOrContainsTheRangeOfTheBar.fs (5,2--5,3),
-                     None,
-                     Const
-                       (Unit,
-                        /root/SynPatOrContainsTheRangeOfTheBar.fs (5,7--5,9)),
-                     /root/SynPatOrContainsTheRangeOfTheBar.fs (5,2--5,9), Yes,
-                     { ArrowRange =
-                        Some
-                          /root/SynPatOrContainsTheRangeOfTheBar.fs (5,4--5,6)
-                       BarRange =
-                        Some
-                          /root/SynPatOrContainsTheRangeOfTheBar.fs (5,0--5,1) })],
-                 /root/SynPatOrContainsTheRangeOfTheBar.fs (2,0--5,9),
-                 { MatchKeyword =
-                    /root/SynPatOrContainsTheRangeOfTheBar.fs (2,0--2,5)
-                   WithKeyword =
-                    /root/SynPatOrContainsTheRangeOfTheBar.fs (2,8--2,12) }),
-              /root/SynPatOrContainsTheRangeOfTheBar.fs (2,0--5,9))],
-          PreXmlDocEmpty, [], None,
-          /root/SynPatOrContainsTheRangeOfTheBar.fs (2,0--6,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
deleted file mode 100644
index cc27154345a..00000000000
--- a/tests/service/data/SyntaxTree/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
+++ /dev/null
@@ -1,57 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs", false,
-      QualifiedNameOfFile SynPatRecordContainsTheRangeOfTheEqualsSign, [], [],
-      [SynModuleOrNamespace
-         ([SynPatRecordContainsTheRangeOfTheEqualsSign], false, AnonModule,
-          [Expr
-             (Match
-                (Yes
-                   /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--2,12),
-                 Ident x,
-                 [SynMatchClause
-                    (Record
-                       ([(([], Foo),
-                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,8--3,9),
-                          Named
-                            (SynIdent (bar, None), false, None,
-                             /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,10--3,13)))],
-                        /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,2--3,15)),
-                     None,
-                     Const
-                       (Unit,
-                        /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,19--3,21)),
-                     /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,2--3,21),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,16--3,18)
-                       BarRange =
-                        Some
-                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (3,0--3,1) });
-                  SynMatchClause
-                    (Wild
-                       /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,2--4,3),
-                     None,
-                     Const
-                       (Unit,
-                        /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,7--4,9)),
-                     /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,2--4,9),
-                     Yes,
-                     { ArrowRange =
-                        Some
-                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,4--4,6)
-                       BarRange =
-                        Some
-                          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (4,0--4,1) })],
-                 /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--4,9),
-                 { MatchKeyword =
-                    /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--2,5)
-                   WithKeyword =
-                    /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,8--2,12) }),
-              /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--4,9))],
-          PreXmlDocEmpty, [], None,
-          /root/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs b/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs
rename to tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs
diff --git a/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
similarity index 51%
rename from tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
rename to tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
index 29cb3c8ff04..80ea6d1837b 100644
--- a/tests/service/data/SyntaxTree/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/NestedSynTypeOrInsideSynExprTraitCall.fs", false,
+     ("/root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs", false,
       QualifiedNameOfFile NestedSynTypeOrInsideSynExprTraitCall, [], [],
       [SynModuleOrNamespace
          ([NestedSynTypeOrInsideSynExprTraitCall], false, AnonModule,
@@ -19,43 +19,43 @@ ImplFile
                        ([op_BangBang], [],
                         [Some
                            (OriginalNotationWithParen
-                              (/root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,11--2,12),
+                              (/root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,11--2,12),
                                "!!",
-                               /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,14--2,15)))]),
+                               /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,14--2,15)))]),
                      None, None,
                      Pats
                        [Paren
                           (Typed
                              (Named
                                 (SynIdent (x, None), false, None,
-                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,17--2,18)),
+                                 /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,17--2,18)),
                               Tuple
                                 (false,
                                  [Type
                                     (Var
                                        (SynTypar (a, HeadType, false),
-                                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,20--2,22)));
+                                        /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,20--2,22)));
                                   Star
-                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,23--2,24);
+                                    /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,23--2,24);
                                   Type
                                     (Var
                                        (SynTypar (b, HeadType, false),
-                                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,25--2,27)))],
-                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,20--2,27)),
-                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,17--2,27)),
-                           /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,16--2,28))],
+                                        /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,25--2,27)))],
+                                 /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,20--2,27)),
+                              /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,17--2,27)),
+                           /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,16--2,28))],
                      None,
-                     /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,11--2,28)),
+                     /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,11--2,28)),
                   Some
                     (SynBindingReturnInfo
                        (Var
                           (SynTypar (c, HeadType, false),
-                           /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,31--2,33)),
-                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,31--2,33),
+                           /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,31--2,33)),
+                        /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,31--2,33),
                         [],
                         { ColonRange =
                            Some
-                             /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,29--2,30) })),
+                             /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,29--2,30) })),
                   Typed
                     (Paren
                        (TraitCall
@@ -64,20 +64,20 @@ ImplFile
                                 (Or
                                    (Var
                                       (SynTypar (a, HeadType, false),
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,38--2,40)),
+                                       /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,38--2,40)),
                                     Var
                                       (SynTypar (b, HeadType, false),
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,44--2,46)),
-                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,38--2,46),
+                                       /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,44--2,46)),
+                                    /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,38--2,46),
                                     { OrKeyword =
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,41--2,43) }),
+                                       /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,41--2,43) }),
                                  Var
                                    (SynTypar (c, HeadType, false),
-                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,50--2,52)),
-                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,38--2,52),
+                                    /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,50--2,52)),
+                                 /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,38--2,52),
                                  { OrKeyword =
-                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,47--2,49) }),
-                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,37--2,53)),
+                                    /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,47--2,49) }),
+                              /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,37--2,53)),
                            Member
                              (SynValSig
                                 ([], SynIdent (op_Implicit, None),
@@ -88,31 +88,31 @@ ImplFile
                                        [Type
                                           (Var
                                              (SynTypar (a, HeadType, false),
-                                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,83--2,85)));
+                                              /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,83--2,85)));
                                         Star
-                                          /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,86--2,87);
+                                          /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,86--2,87);
                                         Type
                                           (Var
                                              (SynTypar (b, HeadType, false),
-                                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,88--2,90)))],
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,83--2,90)),
+                                              /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,88--2,90)))],
+                                       /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,83--2,90)),
                                     Var
                                       (SynTypar (c, HeadType, false),
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,94--2,96)),
-                                    /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,83--2,96),
+                                       /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,94--2,96)),
+                                    /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,83--2,96),
                                     { ArrowRange =
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,91--2,93) }),
+                                       /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,91--2,93) }),
                                  SynValInfo
                                    ([[SynArgInfo ([], false, None);
                                       SynArgInfo ([], false, None)]],
                                     SynArgInfo ([], false, None)), false, false,
                                  PreXmlDoc ((2,56), FSharp.Compiler.Xml.XmlDocCollector),
                                  None, None,
-                                 /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,56--2,96),
+                                 /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,56--2,96),
                                  { LeadingKeyword =
                                     StaticMember
-                                      (/root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,56--2,62),
-                                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,63--2,69))
+                                      (/root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,56--2,62),
+                                       /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,63--2,69))
                                    InlineKeyword = None
                                    WithKeyword = None
                                    EqualsRange = None }),
@@ -122,31 +122,31 @@ ImplFile
                                 IsFinal = false
                                 GetterOrSetterIsCompilerGenerated = false
                                 MemberKind = Member },
-                              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,56--2,96),
+                              /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,56--2,96),
                               { GetSetKeywords = None }), Ident x,
-                           /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,36--2,100)),
-                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,36--2,37),
+                           /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,36--2,100)),
+                        /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,36--2,37),
                         Some
-                          /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,99--2,100),
-                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,36--2,100)),
+                          /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,99--2,100),
+                        /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,36--2,100)),
                      Var
                        (SynTypar (c, HeadType, false),
-                        /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,31--2,33)),
-                     /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,36--2,100)),
-                  /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,11--2,28),
+                        /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,31--2,33)),
+                     /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,36--2,100)),
+                  /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,11--2,28),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,0--2,3)
+                       /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,0--2,3)
                     InlineKeyword =
                      Some
-                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,4--2,10)
+                       /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,4--2,10)
                     EqualsRange =
                      Some
-                       /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,34--2,35) })],
-              /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,0--2,100))],
+                       /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,34--2,35) })],
+              /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,0--2,100))],
           PreXmlDocEmpty, [], None,
-          /root/NestedSynTypeOrInsideSynExprTraitCall.fs (2,0--3,0),
+          /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs b/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs
rename to tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs
diff --git a/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl
similarity index 64%
rename from tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs.bsl
rename to tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl
index e8d722ae8f6..1c28ecab911 100644
--- a/tests/service/data/SyntaxTree/SingleSynTypeInsideSynExprTraitCall.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SingleSynTypeInsideSynExprTraitCall.fs", false,
+     ("/root/SynType/SingleSynTypeInsideSynExprTraitCall.fs", false,
       QualifiedNameOfFile SingleSynTypeInsideSynExprTraitCall, [], [],
       [SynModuleOrNamespace
          ([SingleSynTypeInsideSynExprTraitCall], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SingleSynTypeInsideSynExprTraitCall.fs (2,5--2,6)),
+                     /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -43,7 +43,7 @@ ImplFile
                                            [WhereTyparSupportsMember
                                               (Var
                                                  (SynTypar (b, HeadType, false),
-                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (3,50--3,52)),
+                                                  /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,50--3,52)),
                                                Member
                                                  (SynValSig
                                                     ([],
@@ -58,23 +58,23 @@ ImplFile
                                                                  (SynTypar
                                                                     (a, HeadType,
                                                                      false),
-                                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (3,78--3,80)));
+                                                                  /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,78--3,80)));
                                                             Star
-                                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (3,81--3,82);
+                                                              /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,81--3,82);
                                                             Type
                                                               (Var
                                                                  (SynTypar
                                                                     (b, HeadType,
                                                                      false),
-                                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (3,83--3,85)))],
-                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (3,78--3,85)),
+                                                                  /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,83--3,85)))],
+                                                           /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,78--3,85)),
                                                         Var
                                                           (SynTypar
                                                              (c, HeadType, false),
-                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (3,89--3,91)),
-                                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (3,78--3,91),
+                                                           /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,89--3,91)),
+                                                        /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,78--3,91),
                                                         { ArrowRange =
-                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (3,86--3,88) }),
+                                                           /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,86--3,88) }),
                                                      SynValInfo
                                                        ([[SynArgInfo
                                                             ([], false, None);
@@ -85,11 +85,11 @@ ImplFile
                                                      false, false,
                                                      PreXmlDoc ((3,55), FSharp.Compiler.Xml.XmlDocCollector),
                                                      None, None,
-                                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,55--3,91),
+                                                     /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,55--3,91),
                                                      { LeadingKeyword =
                                                         StaticMember
-                                                          (/root/SingleSynTypeInsideSynExprTraitCall.fs (3,55--3,61),
-                                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (3,62--3,68))
+                                                          (/root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,55--3,61),
+                                                           /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,62--3,68))
                                                        InlineKeyword = None
                                                        WithKeyword = None
                                                        EqualsRange = None }),
@@ -101,10 +101,10 @@ ImplFile
                                                     GetterOrSetterIsCompilerGenerated =
                                                      false
                                                     MemberKind = Member },
-                                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (3,55--3,91),
+                                                  /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,55--3,91),
                                                   { GetSetKeywords = None }),
-                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,50--3,92))],
-                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (3,32--3,93))),
+                                               /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,50--3,92))],
+                                           /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,32--3,93))),
                                      false)),
                                Pats
                                  [Paren
@@ -113,29 +113,29 @@ ImplFile
                                         [Typed
                                            (Named
                                               (SynIdent (a, None), false, None,
-                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,94--3,95)),
+                                               /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,94--3,95)),
                                             Var
                                               (SynTypar (a, HeadType, false),
-                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,97--3,99)),
-                                            /root/SingleSynTypeInsideSynExprTraitCall.fs (3,94--3,99));
+                                               /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,97--3,99)),
+                                            /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,94--3,99));
                                          Typed
                                            (Named
                                               (SynIdent (f, None), false, None,
-                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,101--3,102)),
+                                               /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,101--3,102)),
                                             Var
                                               (SynTypar (b, HeadType, false),
-                                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,104--3,106)),
-                                            /root/SingleSynTypeInsideSynExprTraitCall.fs (3,101--3,106))],
-                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (3,94--3,106)),
-                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,93--3,107))],
+                                               /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,104--3,106)),
+                                            /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,101--3,106))],
+                                        /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,94--3,106)),
+                                     /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,93--3,107))],
                                None,
-                               /root/SingleSynTypeInsideSynExprTraitCall.fs (3,25--3,107)),
+                               /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,25--3,107)),
                             None,
                             Paren
                               (TraitCall
                                  (Var
                                     (SynTypar (b, HeadType, false),
-                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (4,9--4,11)),
+                                     /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,9--4,11)),
                                   Member
                                     (SynValSig
                                        ([], SynIdent (replace, None),
@@ -147,21 +147,21 @@ ImplFile
                                                  (Var
                                                     (SynTypar
                                                        (a, HeadType, false),
-                                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (4,38--4,40)));
+                                                     /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,38--4,40)));
                                                Star
-                                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (4,41--4,42);
+                                                 /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,41--4,42);
                                                Type
                                                  (Var
                                                     (SynTypar
                                                        (b, HeadType, false),
-                                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (4,43--4,45)))],
-                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (4,38--4,45)),
+                                                     /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,43--4,45)))],
+                                              /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,38--4,45)),
                                            Var
                                              (SynTypar (c, HeadType, false),
-                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (4,49--4,51)),
-                                           /root/SingleSynTypeInsideSynExprTraitCall.fs (4,38--4,51),
+                                              /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,49--4,51)),
+                                           /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,38--4,51),
                                            { ArrowRange =
-                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (4,46--4,48) }),
+                                              /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,46--4,48) }),
                                         SynValInfo
                                           ([[SynArgInfo ([], false, None);
                                              SynArgInfo ([], false, None)]],
@@ -169,11 +169,11 @@ ImplFile
                                         false,
                                         PreXmlDoc ((4,15), FSharp.Compiler.Xml.XmlDocCollector),
                                         None, None,
-                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (4,15--4,51),
+                                        /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,15--4,51),
                                         { LeadingKeyword =
                                            StaticMember
-                                             (/root/SingleSynTypeInsideSynExprTraitCall.fs (4,15--4,21),
-                                              /root/SingleSynTypeInsideSynExprTraitCall.fs (4,22--4,28))
+                                             (/root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,15--4,21),
+                                              /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,22--4,28))
                                           InlineKeyword = None
                                           WithKeyword = None
                                           EqualsRange = None }),
@@ -183,48 +183,48 @@ ImplFile
                                        IsFinal = false
                                        GetterOrSetterIsCompilerGenerated = false
                                        MemberKind = Member },
-                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (4,15--4,51),
+                                     /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,15--4,51),
                                      { GetSetKeywords = None }),
                                   Paren
                                     (Tuple
                                        (false, [Ident a; Ident f],
-                                        [/root/SingleSynTypeInsideSynExprTraitCall.fs (4,55--4,56)],
-                                        /root/SingleSynTypeInsideSynExprTraitCall.fs (4,54--4,58)),
-                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (4,53--4,54),
+                                        [/root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,55--4,56)],
+                                        /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,54--4,58)),
+                                     /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,53--4,54),
                                      Some
-                                       /root/SingleSynTypeInsideSynExprTraitCall.fs (4,58--4,59),
-                                     /root/SingleSynTypeInsideSynExprTraitCall.fs (4,53--4,59)),
-                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (4,8--4,60)),
-                               /root/SingleSynTypeInsideSynExprTraitCall.fs (4,8--4,9),
+                                       /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,58--4,59),
+                                     /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,53--4,59)),
+                                  /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,8--4,60)),
+                               /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,8--4,9),
                                Some
-                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (4,59--4,60),
-                               /root/SingleSynTypeInsideSynExprTraitCall.fs (4,8--4,60)),
-                            /root/SingleSynTypeInsideSynExprTraitCall.fs (3,25--3,107),
+                                 /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,59--4,60),
+                               /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (4,8--4,60)),
+                            /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,25--3,107),
                             NoneAtInvisible,
                             { LeadingKeyword =
                                StaticMember
-                                 (/root/SingleSynTypeInsideSynExprTraitCall.fs (3,4--3,10),
-                                  /root/SingleSynTypeInsideSynExprTraitCall.fs (3,11--3,17))
+                                 (/root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,4--3,10),
+                                  /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,11--3,17))
                               InlineKeyword =
                                Some
-                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (3,18--3,24)
+                                 /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,18--3,24)
                               EqualsRange =
                                Some
-                                 /root/SingleSynTypeInsideSynExprTraitCall.fs (3,108--3,109) }),
-                         /root/SingleSynTypeInsideSynExprTraitCall.fs (3,4--4,60))],
-                     /root/SingleSynTypeInsideSynExprTraitCall.fs (3,4--4,60)),
+                                 /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,108--3,109) }),
+                         /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,4--4,60))],
+                     /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (3,4--4,60)),
                   [], None,
-                  /root/SingleSynTypeInsideSynExprTraitCall.fs (2,5--4,60),
+                  /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (2,5--4,60),
                   { LeadingKeyword =
                      Type
-                       /root/SingleSynTypeInsideSynExprTraitCall.fs (2,0--2,4)
+                       /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SingleSynTypeInsideSynExprTraitCall.fs (2,7--2,8)
+                       /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/SingleSynTypeInsideSynExprTraitCall.fs (2,0--4,60))],
+              /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (2,0--4,60))],
           PreXmlDocEmpty, [], None,
-          /root/SingleSynTypeInsideSynExprTraitCall.fs (2,0--5,0),
+          /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs
rename to tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs.bsl
rename to tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl
index 2be4e1656bc..0733758a660 100644
--- a/tests/service/data/SyntaxTree/SynTypeOrInsideSynExprTraitCall.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeOrInsideSynExprTraitCall.fs", false,
+     ("/root/SynType/SynTypeOrInsideSynExprTraitCall.fs", false,
       QualifiedNameOfFile SynTypeOrInsideSynExprTraitCall, [], [],
       [SynModuleOrNamespace
          ([SynTypeOrInsideSynExprTraitCall], false, AnonModule,
@@ -19,32 +19,33 @@ ImplFile
                        ([op_BangBang], [],
                         [Some
                            (OriginalNotationWithParen
-                              (/root/SynTypeOrInsideSynExprTraitCall.fs (2,11--2,12),
+                              (/root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,11--2,12),
                                "!!",
-                               /root/SynTypeOrInsideSynExprTraitCall.fs (2,14--2,15)))]),
+                               /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,14--2,15)))]),
                      None, None,
                      Pats
                        [Paren
                           (Typed
                              (Named
                                 (SynIdent (x, None), false, None,
-                                 /root/SynTypeOrInsideSynExprTraitCall.fs (2,17--2,18)),
+                                 /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,17--2,18)),
                               Var
                                 (SynTypar (a, HeadType, false),
-                                 /root/SynTypeOrInsideSynExprTraitCall.fs (2,20--2,22)),
-                              /root/SynTypeOrInsideSynExprTraitCall.fs (2,17--2,22)),
-                           /root/SynTypeOrInsideSynExprTraitCall.fs (2,16--2,23))],
-                     None, /root/SynTypeOrInsideSynExprTraitCall.fs (2,11--2,23)),
+                                 /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,20--2,22)),
+                              /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,17--2,22)),
+                           /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,16--2,23))],
+                     None,
+                     /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,11--2,23)),
                   Some
                     (SynBindingReturnInfo
                        (Var
                           (SynTypar (b, HeadType, false),
-                           /root/SynTypeOrInsideSynExprTraitCall.fs (2,26--2,28)),
-                        /root/SynTypeOrInsideSynExprTraitCall.fs (2,26--2,28),
+                           /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,26--2,28)),
+                        /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,26--2,28),
                         [],
                         { ColonRange =
                            Some
-                             /root/SynTypeOrInsideSynExprTraitCall.fs (2,24--2,25) })),
+                             /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,24--2,25) })),
                   Typed
                     (Paren
                        (TraitCall
@@ -52,14 +53,14 @@ ImplFile
                              (Or
                                 (Var
                                    (SynTypar (a, HeadType, false),
-                                    /root/SynTypeOrInsideSynExprTraitCall.fs (2,33--2,35)),
+                                    /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,33--2,35)),
                                  Var
                                    (SynTypar (b, HeadType, false),
-                                    /root/SynTypeOrInsideSynExprTraitCall.fs (2,39--2,41)),
-                                 /root/SynTypeOrInsideSynExprTraitCall.fs (2,33--2,41),
+                                    /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,39--2,41)),
+                                 /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,33--2,41),
                                  { OrKeyword =
-                                    /root/SynTypeOrInsideSynExprTraitCall.fs (2,36--2,38) }),
-                              /root/SynTypeOrInsideSynExprTraitCall.fs (2,32--2,42)),
+                                    /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,36--2,38) }),
+                              /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,32--2,42)),
                            Member
                              (SynValSig
                                 ([], SynIdent (op_Implicit, None),
@@ -67,23 +68,23 @@ ImplFile
                                  Fun
                                    (Var
                                       (SynTypar (a, HeadType, false),
-                                       /root/SynTypeOrInsideSynExprTraitCall.fs (2,72--2,74)),
+                                       /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,72--2,74)),
                                     Var
                                       (SynTypar (b, HeadType, false),
-                                       /root/SynTypeOrInsideSynExprTraitCall.fs (2,78--2,80)),
-                                    /root/SynTypeOrInsideSynExprTraitCall.fs (2,72--2,80),
+                                       /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,78--2,80)),
+                                    /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,72--2,80),
                                     { ArrowRange =
-                                       /root/SynTypeOrInsideSynExprTraitCall.fs (2,75--2,77) }),
+                                       /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,75--2,77) }),
                                  SynValInfo
                                    ([[SynArgInfo ([], false, None)]],
                                     SynArgInfo ([], false, None)), false, false,
                                  PreXmlDoc ((2,45), FSharp.Compiler.Xml.XmlDocCollector),
                                  None, None,
-                                 /root/SynTypeOrInsideSynExprTraitCall.fs (2,45--2,80),
+                                 /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,45--2,80),
                                  { LeadingKeyword =
                                     StaticMember
-                                      (/root/SynTypeOrInsideSynExprTraitCall.fs (2,45--2,51),
-                                       /root/SynTypeOrInsideSynExprTraitCall.fs (2,52--2,58))
+                                      (/root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,45--2,51),
+                                       /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,52--2,58))
                                    InlineKeyword = None
                                    WithKeyword = None
                                    EqualsRange = None }),
@@ -93,28 +94,31 @@ ImplFile
                                 IsFinal = false
                                 GetterOrSetterIsCompilerGenerated = false
                                 MemberKind = Member },
-                              /root/SynTypeOrInsideSynExprTraitCall.fs (2,45--2,80),
+                              /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,45--2,80),
                               { GetSetKeywords = None }), Ident x,
-                           /root/SynTypeOrInsideSynExprTraitCall.fs (2,31--2,84)),
-                        /root/SynTypeOrInsideSynExprTraitCall.fs (2,31--2,32),
+                           /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,31--2,84)),
+                        /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,31--2,32),
                         Some
-                          /root/SynTypeOrInsideSynExprTraitCall.fs (2,83--2,84),
-                        /root/SynTypeOrInsideSynExprTraitCall.fs (2,31--2,84)),
+                          /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,83--2,84),
+                        /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,31--2,84)),
                      Var
                        (SynTypar (b, HeadType, false),
-                        /root/SynTypeOrInsideSynExprTraitCall.fs (2,26--2,28)),
-                     /root/SynTypeOrInsideSynExprTraitCall.fs (2,31--2,84)),
-                  /root/SynTypeOrInsideSynExprTraitCall.fs (2,11--2,23),
+                        /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,26--2,28)),
+                     /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,31--2,84)),
+                  /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,11--2,23),
                   NoneAtLet,
                   { LeadingKeyword =
-                     Let /root/SynTypeOrInsideSynExprTraitCall.fs (2,0--2,3)
+                     Let
+                       /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,0--2,3)
                     InlineKeyword =
-                     Some /root/SynTypeOrInsideSynExprTraitCall.fs (2,4--2,10)
+                     Some
+                       /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,4--2,10)
                     EqualsRange =
-                     Some /root/SynTypeOrInsideSynExprTraitCall.fs (2,29--2,30) })],
-              /root/SynTypeOrInsideSynExprTraitCall.fs (2,0--2,84))],
+                     Some
+                       /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,29--2,30) })],
+              /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,0--2,84))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeOrInsideSynExprTraitCall.fs (2,0--3,0),
+          /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs
rename to tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
similarity index 57%
rename from tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
rename to tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
index fb4823f7721..be6aaa43454 100644
--- a/tests/service/data/SyntaxTree/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs", false,
+     ("/root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs",
+      false,
       QualifiedNameOfFile
         SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember, [], [],
       [SynModuleOrNamespace
@@ -26,14 +27,14 @@ ImplFile
                                        (Or
                                           (Var
                                              (SynTypar (T1, None, false),
-                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,41--2,44)),
+                                              /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,41--2,44)),
                                            Var
                                              (SynTypar (T2, None, false),
-                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,48--2,51)),
-                                           /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,41--2,51),
+                                              /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,48--2,51)),
+                                           /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,41--2,51),
                                            { OrKeyword =
-                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,45--2,47) }),
-                                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,40--2,52)),
+                                              /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,45--2,47) }),
+                                        /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,40--2,52)),
                                      Member
                                        (SynValSig
                                           ([], SynIdent (StaticMethod, None),
@@ -45,20 +46,20 @@ ImplFile
                                               LongIdent
                                                 (SynLongIdent
                                                    ([int], [], [None])),
-                                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,84--2,94),
+                                              /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,84--2,94),
                                               { ArrowRange =
-                                                 /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,88--2,90) }),
+                                                 /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,88--2,90) }),
                                            SynValInfo
                                              ([[SynArgInfo ([], false, None)]],
                                               SynArgInfo ([], false, None)),
                                            false, false,
                                            PreXmlDoc ((2,56), FSharp.Compiler.Xml.XmlDocCollector),
                                            None, None,
-                                           /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,56--2,94),
+                                           /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,56--2,94),
                                            { LeadingKeyword =
                                               StaticMember
-                                                (/root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,56--2,62),
-                                                 /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,63--2,69))
+                                                (/root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,56--2,62),
+                                                 /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,63--2,69))
                                              InlineKeyword = None
                                              WithKeyword = None
                                              EqualsRange = None }),
@@ -69,47 +70,47 @@ ImplFile
                                           GetterOrSetterIsCompilerGenerated =
                                            false
                                           MemberKind = Member },
-                                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,56--2,94),
+                                        /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,56--2,94),
                                         { GetSetKeywords = None }),
-                                     /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,40--2,95))],
-                                 /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,25--2,97))),
+                                     /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,40--2,95))],
+                                 /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,25--2,97))),
                            false)),
                      Pats
                        [Paren
                           (Const
                              (Unit,
-                              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,97--2,99)),
-                           /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,97--2,99))],
+                              /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,97--2,99)),
+                           /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,97--2,99))],
                      None,
-                     /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,11--2,99)),
+                     /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,11--2,99)),
                   Some
                     (SynBindingReturnInfo
                        (LongIdent (SynLongIdent ([int], [], [None])),
-                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,102--2,105),
+                        /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,102--2,105),
                         [],
                         { ColonRange =
                            Some
-                             /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,100--2,101) })),
+                             /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,100--2,101) })),
                   Typed
                     (Const
                        (Unit,
-                        /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (3,4--3,6)),
+                        /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (3,4--3,6)),
                      LongIdent (SynLongIdent ([int], [], [None])),
-                     /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (3,4--3,6)),
-                  /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,11--2,99),
+                     /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (3,4--3,6)),
+                  /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,11--2,99),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,0--2,3)
+                       /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,0--2,3)
                     InlineKeyword =
                      Some
-                       /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,4--2,10)
+                       /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,4--2,10)
                     EqualsRange =
                      Some
-                       /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,106--2,107) })],
-              /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,0--3,6))],
+                       /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,106--2,107) })],
+              /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,0--3,6))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,0--4,0),
+          /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs b/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs
rename to tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
similarity index 55%
rename from tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
rename to tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
index 027d93cc6dc..439840c44b8 100644
--- a/tests/service/data/SyntaxTree/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeOrWithAppTypeOnTheRightHandSide.fs", false,
+     ("/root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs", false,
       QualifiedNameOfFile SynTypeOrWithAppTypeOnTheRightHandSide, [], [],
       [SynModuleOrNamespace
          ([SynTypeOrWithAppTypeOnTheRightHandSide], false, AnonModule,
@@ -21,14 +21,14 @@ ImplFile
                           (Typed
                              (Named
                                 (SynIdent (x, None), false, None,
-                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,14--2,15)),
+                                 /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,14--2,15)),
                               Var
                                 (SynTypar (T, None, false),
-                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,17--2,19)),
-                              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,14--2,19)),
-                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,13--2,20))],
+                                 /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,17--2,19)),
+                              /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,14--2,19)),
+                           /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,13--2,20))],
                      None,
-                     /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,11--2,20)),
+                     /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,11--2,20)),
                   None,
                   Paren
                     (TraitCall
@@ -36,12 +36,12 @@ ImplFile
                           (Or
                              (Var
                                 (SynTypar (T, HeadType, false),
-                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,25--2,27)),
+                                 /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,25--2,27)),
                               LongIdent (SynLongIdent ([int], [], [None])),
-                              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,25--2,34),
+                              /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,25--2,34),
                               { OrKeyword =
-                                 /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,28--2,30) }),
-                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,24--2,35)),
+                                 /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,28--2,30) }),
+                           /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,24--2,35)),
                         Member
                           (SynValSig
                              ([], SynIdent (A, None),
@@ -51,11 +51,11 @@ ImplFile
                               false, false,
                               PreXmlDoc ((2,39), FSharp.Compiler.Xml.XmlDocCollector),
                               None, None,
-                              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,39--2,59),
+                              /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,39--2,59),
                               { LeadingKeyword =
                                  StaticMember
-                                   (/root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,39--2,45),
-                                    /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,46--2,52))
+                                   (/root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,39--2,45),
+                                    /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,46--2,52))
                                 InlineKeyword = None
                                 WithKeyword = None
                                 EqualsRange = None }),
@@ -65,30 +65,30 @@ ImplFile
                              IsFinal = false
                              GetterOrSetterIsCompilerGenerated = false
                              MemberKind = PropertyGet },
-                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,39--2,59),
+                           /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,39--2,59),
                            { GetSetKeywords = None }),
                         Const
                           (Unit,
-                           /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,61--2,63)),
-                        /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,23--2,64)),
-                     /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,23--2,24),
+                           /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,61--2,63)),
+                        /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,23--2,64)),
+                     /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,23--2,24),
                      Some
-                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,63--2,64),
-                     /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,23--2,64)),
-                  /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,11--2,20),
+                       /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,63--2,64),
+                     /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,23--2,64)),
+                  /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,11--2,20),
                   NoneAtLet,
                   { LeadingKeyword =
                      Let
-                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,0--2,3)
+                       /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,0--2,3)
                     InlineKeyword =
                      Some
-                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,4--2,10)
+                       /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,4--2,10)
                     EqualsRange =
                      Some
-                       /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,21--2,22) })],
-              /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,0--2,64))],
+                       /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,21--2,22) })],
+              /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,0--2,64))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,0--3,0),
+          /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi
rename to tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
similarity index 63%
rename from tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
rename to tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
index 9df8bca65c0..bd6fe455130 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi",
+     ("/root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi",
       QualifiedNameOfFile SynTypeTupleDoesIncludeLeadingParameterAttributes, [],
       [],
       [SynModuleOrNamespaceSig
@@ -11,7 +11,7 @@ SigFile
                     ([], None, [], [T],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,5--2,6)),
+                     /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -30,19 +30,19 @@ SigFile
                                                 ArgExpr =
                                                  Const
                                                    (Unit,
-                                                    /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,16--3,29))
+                                                    /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,16--3,29))
                                                 Target = None
                                                 AppliesToGetterAndSetter = false
                                                 Range =
-                                                 /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,16--3,29) }]
+                                                 /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,16--3,29) }]
                                             Range =
-                                             /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,31) }],
+                                             /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,31) }],
                                          false, None,
                                          LongIdent
                                            (SynLongIdent ([a], [], [None])),
-                                         /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,33)));
+                                         /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,33)));
                                    Star
-                                     /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,34--3,35);
+                                     /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,34--3,35);
                                    Type
                                      (SignatureParameter
                                         ([{ Attributes =
@@ -52,22 +52,22 @@ SigFile
                                                 ArgExpr =
                                                  Const
                                                    (Unit,
-                                                    /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,38--3,52))
+                                                    /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,38--3,52))
                                                 Target = None
                                                 AppliesToGetterAndSetter = false
                                                 Range =
-                                                 /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,38--3,52) }]
+                                                 /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,38--3,52) }]
                                             Range =
-                                             /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,36--3,54) }],
+                                             /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,36--3,54) }],
                                          false, None,
                                          LongIdent
                                            (SynLongIdent ([b], [], [None])),
-                                         /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,36--3,56)))],
-                                  /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,56)),
+                                         /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,36--3,56)))],
+                                  /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,56)),
                                LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,63),
+                               /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,63),
                                { ArrowRange =
-                                  /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,57--3,59) }),
+                                  /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,57--3,59) }),
                             SynValInfo
                               ([[SynArgInfo
                                    ([{ Attributes =
@@ -77,13 +77,13 @@ SigFile
                                            ArgExpr =
                                             Const
                                               (Unit,
-                                               /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,16--3,29))
+                                               /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,16--3,29))
                                            Target = None
                                            AppliesToGetterAndSetter = false
                                            Range =
-                                            /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,16--3,29) }]
+                                            /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,16--3,29) }]
                                        Range =
-                                        /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,31) }],
+                                        /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,14--3,31) }],
                                     false, None);
                                  SynArgInfo
                                    ([{ Attributes =
@@ -93,21 +93,21 @@ SigFile
                                            ArgExpr =
                                             Const
                                               (Unit,
-                                               /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,38--3,52))
+                                               /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,38--3,52))
                                            Target = None
                                            AppliesToGetterAndSetter = false
                                            Range =
-                                            /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,38--3,52) }]
+                                            /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,38--3,52) }]
                                        Range =
-                                        /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,36--3,54) }],
+                                        /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,36--3,54) }],
                                     false, None)]], SynArgInfo ([], false, None)),
                             false, false,
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,4--3,63),
+                            /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,4--3,63),
                             { LeadingKeyword =
                                Member
-                                 /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,4--3,10)
+                                 /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,4--3,10)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -117,20 +117,20 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,4--3,63),
+                         /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,4--3,63),
                          { GetSetKeywords = None })],
-                     /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,4--3,63)),
+                     /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (3,4--3,63)),
                   [],
-                  /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,5--3,63),
+                  /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,5--3,63),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,0--2,4)
+                       /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,7--2,8)
+                       /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,7--2,8)
                     WithKeyword = None })],
-              /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,0--3,63))],
+              /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,0--3,63))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,0--4,0),
+          /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,0--4,0),
           { LeadingKeyword = None })], { ConditionalDirectives = []
                                          CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi
rename to tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
similarity index 62%
rename from tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
rename to tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
index 01721ead8b0..5afa85a88a0 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
@@ -1,6 +1,6 @@
 SigFile
   (ParsedSigFileInput
-     ("/root/SynTypeTupleDoesIncludeLeadingParameterName.fsi",
+     ("/root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi",
       QualifiedNameOfFile SynTypeTupleDoesIncludeLeadingParameterName, [], [],
       [SynModuleOrNamespaceSig
          ([SynTypeTupleDoesIncludeLeadingParameterName], false, AnonModule,
@@ -10,7 +10,7 @@ SigFile
                     ([], None, [], [T],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,5--2,6)),
+                     /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [Member
@@ -25,30 +25,30 @@ SigFile
                                         ([], false, Some p1,
                                          LongIdent
                                            (SynLongIdent ([a], [], [None])),
-                                         /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,14--3,19)));
+                                         /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,14--3,19)));
                                    Star
-                                     /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,20--3,21);
+                                     /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,20--3,21);
                                    Type
                                      (SignatureParameter
                                         ([], false, Some p2,
                                          LongIdent
                                            (SynLongIdent ([b], [], [None])),
-                                         /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,22--3,27)))],
-                                  /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,14--3,27)),
+                                         /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,22--3,27)))],
+                                  /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,14--3,27)),
                                LongIdent (SynLongIdent ([int], [], [None])),
-                               /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,14--3,34),
+                               /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,14--3,34),
                                { ArrowRange =
-                                  /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,28--3,30) }),
+                                  /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,28--3,30) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, Some p1);
                                  SynArgInfo ([], false, Some p2)]],
                                SynArgInfo ([], false, None)), false, false,
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,4--3,34),
+                            /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,4--3,34),
                             { LeadingKeyword =
                                Member
-                                 /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,4--3,10)
+                                 /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,4--3,10)
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -58,20 +58,20 @@ SigFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,4--3,34),
+                         /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,4--3,34),
                          { GetSetKeywords = None })],
-                     /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,4--3,34)),
+                     /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (3,4--3,34)),
                   [],
-                  /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,5--3,34),
+                  /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,5--3,34),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,0--2,4)
+                       /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,7--2,8)
+                       /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,7--2,8)
                     WithKeyword = None })],
-              /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,0--3,34))],
+              /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,0--3,34))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,0--4,0),
+          /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,0--4,0),
           { LeadingKeyword = None })], { ConditionalDirectives = []
                                          CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
deleted file mode 100644
index 60c55874d27..00000000000
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
+++ /dev/null
@@ -1,59 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi",
-      QualifiedNameOfFile SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign,
-      [], [],
-      [SynModuleOrNamespaceSig
-         ([SomeNamespace], false, DeclaredNamespace,
-          [Types
-             ([SynTypeDefnSig
-                 (SynComponentInfo
-                    ([], None, [], [Bear],
-                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,5--4,9)),
-                  Simple
-                    (Enum
-                       ([SynEnumCase
-                           ([], SynIdent (BlackBear, None),
-                            Const
-                              (Int32 1,
-                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,18--5,19)),
-                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,6--5,19),
-                            { BarRange =
-                               Some
-                                 /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,4--5,5)
-                              EqualsRange =
-                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,16--5,17) });
-                         SynEnumCase
-                           ([], SynIdent (PolarBear, None),
-                            Const
-                              (Int32 2,
-                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (6,18--6,19)),
-                            PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (6,6--6,19),
-                            { BarRange =
-                               Some
-                                 /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (6,4--6,5)
-                              EqualsRange =
-                               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (6,16--6,17) })],
-                        /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,4--6,19)),
-                     /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (5,4--6,19)),
-                  [],
-                  /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,5--6,19),
-                  { LeadingKeyword =
-                     Type
-                       /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,0--4,4)
-                    EqualsRange =
-                     Some
-                       /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,10--4,11)
-                    WithKeyword = None })],
-              /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (4,0--6,19))],
-          PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (2,0--6,19),
-          { LeadingKeyword =
-             Namespace
-               /root/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
deleted file mode 100644
index c0d18deea51..00000000000
--- a/tests/service/data/SyntaxTree/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
+++ /dev/null
@@ -1,35 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi",
-      QualifiedNameOfFile
-        SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign, [],
-      [],
-      [SynModuleOrNamespaceSig
-         ([SomeNamespace], false, DeclaredNamespace,
-          [Types
-             ([SynTypeDefnSig
-                 (SynComponentInfo
-                    ([], None, [], [Foobar],
-                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,5--4,11)),
-                  ObjectModel
-                    (Class, [],
-                     /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (5,4--6,7)),
-                  [],
-                  /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,5--6,7),
-                  { LeadingKeyword =
-                     Type
-                       /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,0--4,4)
-                    EqualsRange =
-                     Some
-                       /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,12--4,13)
-                    WithKeyword = None })],
-              /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (4,0--6,7))],
-          PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (2,0--6,7),
-          { LeadingKeyword =
-             Namespace
-               /root/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
deleted file mode 100644
index 82e79742031..00000000000
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
+++ /dev/null
@@ -1,58 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs", false,
-      QualifiedNameOfFile SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign, [],
-      [],
-      [SynModuleOrNamespace
-         ([SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign], false,
-          AnonModule,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [Bear],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,5--2,9)),
-                  Simple
-                    (Enum
-                       ([SynEnumCase
-                           ([], SynIdent (BlackBear, None),
-                            Const
-                              (Int32 1,
-                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,18--3,19)),
-                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,6--3,19),
-                            { BarRange =
-                               Some
-                                 /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,4--3,5)
-                              EqualsRange =
-                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,16--3,17) });
-                         SynEnumCase
-                           ([], SynIdent (PolarBear, None),
-                            Const
-                              (Int32 2,
-                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (4,18--4,19)),
-                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (4,6--4,19),
-                            { BarRange =
-                               Some
-                                 /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (4,4--4,5)
-                              EqualsRange =
-                               /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (4,16--4,17) })],
-                        /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,4--4,19)),
-                     /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,4--4,19)),
-                  [], None,
-                  /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,5--4,19),
-                  { LeadingKeyword =
-                     Type
-                       /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
-                    EqualsRange =
-                     Some
-                       /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,10--2,11)
-                    WithKeyword = None })],
-              /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,0--4,19))],
-          PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl b/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
deleted file mode 100644
index c171cecd282..00000000000
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
+++ /dev/null
@@ -1,58 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs", false,
-      QualifiedNameOfFile SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword,
-      [], [],
-      [SynModuleOrNamespace
-         ([SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword], false,
-          AnonModule,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [A],
-                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,5--4,6)),
-                  Simple
-                    (TypeAbbrev
-                       (Ok, LongIdent (SynLongIdent ([B], [], [None])),
-                        /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,9--4,10)),
-                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,9--4,10)),
-                  [], None,
-                  /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (2,0--4,10),
-                  { LeadingKeyword =
-                     Type
-                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,0--4,4)
-                    EqualsRange =
-                     Some
-                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,7--4,8)
-                    WithKeyword = None });
-               SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [C],
-                     PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None,
-                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,4--5,5)),
-                  Simple
-                    (TypeAbbrev
-                       (Ok, LongIdent (SynLongIdent ([D], [], [None])),
-                        /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,8--5,9)),
-                     /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,8--5,9)),
-                  [], None,
-                  /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,4--5,9),
-                  { LeadingKeyword =
-                     And
-                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,0--5,3)
-                    EqualsRange =
-                     Some
-                       /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,6--5,7)
-                    WithKeyword = None })],
-              /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (2,0--5,9))],
-          PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,0--6,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments =
-         [LineComment
-            /root/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,0--3,8)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs.bsl b/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs.bsl
deleted file mode 100644
index 0204b552f23..00000000000
--- a/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs.bsl
+++ /dev/null
@@ -1,35 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynTypeFunHasRangeOfArrow.fs", false,
-      QualifiedNameOfFile SynTypeFunHasRangeOfArrow, [], [],
-      [SynModuleOrNamespace
-         ([SynTypeFunHasRangeOfArrow], false, AnonModule,
-          [Types
-             ([SynTypeDefn
-                 (SynComponentInfo
-                    ([], None, [], [X],
-                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/SynTypeFunHasRangeOfArrow.fs (2,5--2,6)),
-                  Simple
-                    (TypeAbbrev
-                       (Ok,
-                        Fun
-                          (LongIdent (SynLongIdent ([string], [], [None])),
-                           LongIdent (SynLongIdent ([int], [], [None])),
-                           /root/SynTypeFunHasRangeOfArrow.fs (2,9--3,20),
-                           { ArrowRange =
-                              /root/SynTypeFunHasRangeOfArrow.fs (2,16--2,18) }),
-                        /root/SynTypeFunHasRangeOfArrow.fs (2,9--3,20)),
-                     /root/SynTypeFunHasRangeOfArrow.fs (2,9--3,20)), [], None,
-                  /root/SynTypeFunHasRangeOfArrow.fs (2,5--3,20),
-                  { LeadingKeyword =
-                     Type /root/SynTypeFunHasRangeOfArrow.fs (2,0--2,4)
-                    EqualsRange =
-                     Some /root/SynTypeFunHasRangeOfArrow.fs (2,7--2,8)
-                    WithKeyword = None })],
-              /root/SynTypeFunHasRangeOfArrow.fs (2,0--3,20))], PreXmlDocEmpty,
-          [], None, /root/SynTypeFunHasRangeOfArrow.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments =
-         [LineComment /root/SynTypeFunHasRangeOfArrow.fs (2,19--2,59)] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs.bsl b/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs.bsl
deleted file mode 100644
index e5761114482..00000000000
--- a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs.bsl
+++ /dev/null
@@ -1,52 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SynTypeTupleWithStruct,Recovery.fs", false,
-      QualifiedNameOfFile SynTypeTupleWithStruct,Recovery, [], [],
-      [SynModuleOrNamespace
-         ([SynTypeTupleWithStruct,Recovery], false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Wild /root/SynTypeTupleWithStruct,Recovery.fs (2,4--2,5),
-                  Some
-                    (SynBindingReturnInfo
-                       (Tuple
-                          (true,
-                           [Type (LongIdent (SynLongIdent ([int], [], [None])));
-                            Star
-                              /root/SynTypeTupleWithStruct,Recovery.fs (2,19--2,20);
-                            Type (LongIdent (SynLongIdent ([int], [], [None])))],
-                           /root/SynTypeTupleWithStruct,Recovery.fs (2,7--2,24)),
-                        /root/SynTypeTupleWithStruct,Recovery.fs (2,7--2,26), [],
-                        { ColonRange =
-                           Some
-                             /root/SynTypeTupleWithStruct,Recovery.fs (2,5--2,6) })),
-                  Typed
-                    (Const
-                       (Unit,
-                        /root/SynTypeTupleWithStruct,Recovery.fs (2,27--2,29)),
-                     Tuple
-                       (true,
-                        [Type (LongIdent (SynLongIdent ([int], [], [None])));
-                         Star
-                           /root/SynTypeTupleWithStruct,Recovery.fs (2,19--2,20);
-                         Type (LongIdent (SynLongIdent ([int], [], [None])))],
-                        /root/SynTypeTupleWithStruct,Recovery.fs (2,7--2,24)),
-                     /root/SynTypeTupleWithStruct,Recovery.fs (2,27--2,29)),
-                  /root/SynTypeTupleWithStruct,Recovery.fs (2,4--2,5),
-                  Yes /root/SynTypeTupleWithStruct,Recovery.fs (2,0--2,29),
-                  { LeadingKeyword =
-                     Let /root/SynTypeTupleWithStruct,Recovery.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some /root/SynTypeTupleWithStruct,Recovery.fs (2,25--2,26) })],
-              /root/SynTypeTupleWithStruct,Recovery.fs (2,0--2,29))],
-          PreXmlDocEmpty, [], None,
-          /root/SynTypeTupleWithStruct,Recovery.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SyntheticKeyword.fs.bsl b/tests/service/data/SyntaxTree/SyntheticKeyword.fs.bsl
deleted file mode 100644
index 9e12f033b89..00000000000
--- a/tests/service/data/SyntaxTree/SyntheticKeyword.fs.bsl
+++ /dev/null
@@ -1,30 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/SyntheticKeyword.fs", false, QualifiedNameOfFile SyntheticKeyword,
-      [], [],
-      [SynModuleOrNamespace
-         ([SyntheticKeyword], false, AnonModule,
-          [Expr
-             (ObjExpr
-                (LongIdent (SynLongIdent ([ISomething], [], [None])), None,
-                 Some /root/SyntheticKeyword.fs (2,17--2,21),
-                 [SynBinding
-                    (None, Normal, false, false, [], PreXmlDocEmpty,
-                     SynValData
-                       (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                        None),
-                     Named
-                       (SynIdent (a, None), false, None,
-                        /root/SyntheticKeyword.fs (3,4--3,5)), None,
-                     Const (Unit, /root/SyntheticKeyword.fs (3,8--3,10)),
-                     /root/SyntheticKeyword.fs (3,4--3,5),
-                     Yes /root/SyntheticKeyword.fs (3,8--3,10),
-                     { LeadingKeyword = Synthetic
-                       InlineKeyword = None
-                       EqualsRange = Some /root/SyntheticKeyword.fs (3,6--3,7) })],
-                 [], [], /root/SyntheticKeyword.fs (2,2--2,16),
-                 /root/SyntheticKeyword.fs (2,0--3,12)),
-              /root/SyntheticKeyword.fs (2,0--3,12))], PreXmlDocEmpty, [], None,
-          /root/SyntheticKeyword.fs (2,0--3,12), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
deleted file mode 100644
index 50988fb214b..00000000000
--- a/tests/service/data/SyntaxTree/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
+++ /dev/null
@@ -1,16 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/TripleQuoteStringAsParsedHashDirectiveArgument.fs", false,
-      QualifiedNameOfFile TripleQuoteStringAsParsedHashDirectiveArgument, [], [],
-      [SynModuleOrNamespace
-         ([TripleQuoteStringAsParsedHashDirectiveArgument], false, AnonModule,
-          [HashDirective
-             (ParsedHashDirective
-                ("nowarn", [],
-                 /root/TripleQuoteStringAsParsedHashDirectiveArgument.fs (2,0--2,7)),
-              /root/TripleQuoteStringAsParsedHashDirectiveArgument.fs (2,0--2,9))],
-          PreXmlDocEmpty, [], None,
-          /root/TripleQuoteStringAsParsedHashDirectiveArgument.fs (2,0--2,9),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs.bsl b/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs.bsl
deleted file mode 100644
index 599b6b97a9d..00000000000
--- a/tests/service/data/SyntaxTree/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs.bsl
+++ /dev/null
@@ -1,71 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs",
-      false,
-      QualifiedNameOfFile
-        TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation, [], [],
-      [SynModuleOrNamespace
-         ([TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation], false,
-          AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (x, None), false, None,
-                     /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (3,4--3,5)),
-                  None,
-                  Sequential
-                    (SuppressNeither, true,
-                     While
-                       (Yes
-                          /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,4--8,14),
-                        Const
-                          (Bool true,
-                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,10--8,14)),
-                        Const
-                          (Unit,
-                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,18--8,20)),
-                        /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,4--8,20)),
-                     App
-                       (NonAtomic, false,
-                        App
-                          (NonAtomic, true,
-                           LongIdent
-                             (false,
-                              SynLongIdent
-                                ([op_Addition], [],
-                                 [Some (OriginalNotation "+")]), None,
-                              /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (9,6--9,7)),
-                           Ident a,
-                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (9,4--9,7)),
-                        Const
-                          (Int32 1,
-                           /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (9,8--9,9)),
-                        /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (9,4--9,9)),
-                     /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (8,4--9,9)),
-                  /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (2,0--3,5),
-                  NoneAtLet,
-                  { LeadingKeyword =
-                     Let
-                       /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (3,0--3,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some
-                       /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (3,6--3,7) })],
-              /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (2,0--9,9))],
-          PreXmlDocEmpty, [], None,
-          /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (3,0--10,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments =
-         [LineComment
-            /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (4,4--4,40);
-          LineComment
-            /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (6,4--6,36);
-          LineComment
-            /root/TripleSlashCommentShouldBeCaptured,IfUsedInAnInvalidLocation.fs (7,4--7,27)] },
-      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs.bsl
deleted file mode 100644
index 1dad7840201..00000000000
--- a/tests/service/data/SyntaxTree/TupleInLambdaHasArrowRange.fs.bsl
+++ /dev/null
@@ -1,64 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/TupleInLambdaHasArrowRange.fs", false,
-      QualifiedNameOfFile TupleInLambdaHasArrowRange, [], [],
-      [SynModuleOrNamespace
-         ([TupleInLambdaHasArrowRange], false, AnonModule,
-          [Expr
-             (Lambda
-                (false, false,
-                 SimplePats
-                   ([Id
-                       (x, None, false, false, false,
-                        /root/TupleInLambdaHasArrowRange.fs (2,5--2,6));
-                     Id
-                       (_arg1, None, true, false, false,
-                        /root/TupleInLambdaHasArrowRange.fs (2,8--2,9))],
-                    /root/TupleInLambdaHasArrowRange.fs (2,4--2,10)),
-                 App
-                   (NonAtomic, false,
-                    App
-                      (NonAtomic, true,
-                       LongIdent
-                         (false,
-                          SynLongIdent
-                            ([op_Multiply], [], [Some (OriginalNotation "*")]),
-                          None, /root/TupleInLambdaHasArrowRange.fs (2,16--2,17)),
-                       Ident x, /root/TupleInLambdaHasArrowRange.fs (2,14--2,17)),
-                    Const
-                      (Int32 3, /root/TupleInLambdaHasArrowRange.fs (2,18--2,19)),
-                    /root/TupleInLambdaHasArrowRange.fs (2,14--2,19)),
-                 Some
-                   ([Paren
-                       (Tuple
-                          (false,
-                           [Named
-                              (SynIdent (x, None), false, None,
-                               /root/TupleInLambdaHasArrowRange.fs (2,5--2,6));
-                            Wild /root/TupleInLambdaHasArrowRange.fs (2,8--2,9)],
-                           /root/TupleInLambdaHasArrowRange.fs (2,5--2,9)),
-                        /root/TupleInLambdaHasArrowRange.fs (2,4--2,10))],
-                    App
-                      (NonAtomic, false,
-                       App
-                         (NonAtomic, true,
-                          LongIdent
-                            (false,
-                             SynLongIdent
-                               ([op_Multiply], [], [Some (OriginalNotation "*")]),
-                             None,
-                             /root/TupleInLambdaHasArrowRange.fs (2,16--2,17)),
-                          Ident x,
-                          /root/TupleInLambdaHasArrowRange.fs (2,14--2,17)),
-                       Const
-                         (Int32 3,
-                          /root/TupleInLambdaHasArrowRange.fs (2,18--2,19)),
-                       /root/TupleInLambdaHasArrowRange.fs (2,14--2,19))),
-                 /root/TupleInLambdaHasArrowRange.fs (2,0--2,19),
-                 { ArrowRange =
-                    Some /root/TupleInLambdaHasArrowRange.fs (2,11--2,13) }),
-              /root/TupleInLambdaHasArrowRange.fs (2,0--2,19))], PreXmlDocEmpty,
-          [], None, /root/TupleInLambdaHasArrowRange.fs (2,0--3,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs.bsl b/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
deleted file mode 100644
index fa1f3288bf4..00000000000
--- a/tests/service/data/SyntaxTree/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
+++ /dev/null
@@ -1,131 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/TupleReturnTypeOfBindingShouldContainStars.fs", false,
-      QualifiedNameOfFile TupleReturnTypeOfBindingShouldContainStars, [], [],
-      [SynModuleOrNamespace
-         ([TupleReturnTypeOfBindingShouldContainStars], false, AnonModule,
-          [Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (a, None), false, None,
-                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,4--2,5)),
-                  Some
-                    (SynBindingReturnInfo
-                       (Tuple
-                          (false,
-                           [Type (LongIdent (SynLongIdent ([int], [], [None])));
-                            Star
-                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,12--2,13);
-                            Type
-                              (LongIdent (SynLongIdent ([string], [], [None])))],
-                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,20)),
-                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,20),
-                        [],
-                        { ColonRange =
-                           Some
-                             /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,6--2,7) })),
-                  Typed
-                    (App
-                       (NonAtomic, false, Ident failwith,
-                        Const
-                          (String
-                             ("todo", Regular,
-                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,32--2,38)),
-                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,32--2,38)),
-                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,23--2,38)),
-                     Tuple
-                       (false,
-                        [Type (LongIdent (SynLongIdent ([int], [], [None])));
-                         Star
-                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,12--2,13);
-                         Type (LongIdent (SynLongIdent ([string], [], [None])))],
-                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,8--2,20)),
-                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,23--2,38)),
-                  /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,4--2,5),
-                  Yes
-                    /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,38),
-                  { LeadingKeyword =
-                     Let
-                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some
-                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,21--2,22) })],
-              /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--2,38));
-           Let
-             (false,
-              [SynBinding
-                 (None, Normal, false, false, [],
-                  PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
-                  SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Named
-                    (SynIdent (b, None), false, None,
-                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,4--3,5)),
-                  Some
-                    (SynBindingReturnInfo
-                       (Tuple
-                          (false,
-                           [Type (LongIdent (SynLongIdent ([int], [], [None])));
-                            Star
-                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,12--3,13);
-                            Type
-                              (LongIdent (SynLongIdent ([string], [], [None])));
-                            Star
-                              /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,21--3,22);
-                            Type (LongIdent (SynLongIdent ([bool], [], [None])))],
-                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,8--3,27)),
-                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,8--3,27),
-                        [],
-                        { ColonRange =
-                           Some
-                             /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,6--3,7) })),
-                  Typed
-                    (Tuple
-                       (false,
-                        [Const
-                           (Int32 1,
-                            /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,30--3,31));
-                         Const
-                           (String
-                              ("", Regular,
-                               /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,33--3,35)),
-                            /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,33--3,35));
-                         Const
-                           (Bool false,
-                            /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,37--3,42))],
-                        [/root/TupleReturnTypeOfBindingShouldContainStars.fs (3,31--3,32);
-                         /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,35--3,36)],
-                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,30--3,42)),
-                     Tuple
-                       (false,
-                        [Type (LongIdent (SynLongIdent ([int], [], [None])));
-                         Star
-                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,12--3,13);
-                         Type (LongIdent (SynLongIdent ([string], [], [None])));
-                         Star
-                           /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,21--3,22);
-                         Type (LongIdent (SynLongIdent ([bool], [], [None])))],
-                        /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,8--3,27)),
-                     /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,30--3,42)),
-                  /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,4--3,5),
-                  Yes
-                    /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,0--3,42),
-                  { LeadingKeyword =
-                     Let
-                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,0--3,3)
-                    InlineKeyword = None
-                    EqualsRange =
-                     Some
-                       /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,28--3,29) })],
-              /root/TupleReturnTypeOfBindingShouldContainStars.fs (3,0--3,42))],
-          PreXmlDocEmpty, [], None,
-          /root/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--4,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs b/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs
rename to tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs
diff --git a/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs.bsl b/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl
similarity index 63%
rename from tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs.bsl
rename to tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl
index 56aae9a2766..58dfd7643e5 100644
--- a/tests/service/data/SyntaxTree/AttributesInOptionalNamedMemberParameter.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/AttributesInOptionalNamedMemberParameter.fs", false,
+     ("/root/Type/AttributesInOptionalNamedMemberParameter.fs", false,
       QualifiedNameOfFile AttributesInOptionalNamedMemberParameter, [], [],
       [SynModuleOrNamespace
          ([AttributesInOptionalNamedMemberParameter], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/AttributesInOptionalNamedMemberParameter.fs (2,5--2,6)),
+                     /root/Type/AttributesInOptionalNamedMemberParameter.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [AbstractSlot
@@ -25,30 +25,30 @@ ImplFile
                                          ArgExpr =
                                           Const
                                             (Unit,
-                                             /root/AttributesInOptionalNamedMemberParameter.fs (3,25--3,28))
+                                             /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,25--3,28))
                                          Target = None
                                          AppliesToGetterAndSetter = false
                                          Range =
-                                          /root/AttributesInOptionalNamedMemberParameter.fs (3,25--3,28) };
+                                          /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,25--3,28) };
                                        { TypeName =
                                           SynLongIdent ([Bar], [], [None])
                                          ArgExpr =
                                           Const
                                             (Unit,
-                                             /root/AttributesInOptionalNamedMemberParameter.fs (3,30--3,33))
+                                             /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,30--3,33))
                                          Target = None
                                          AppliesToGetterAndSetter = false
                                          Range =
-                                          /root/AttributesInOptionalNamedMemberParameter.fs (3,30--3,33) }]
+                                          /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,30--3,33) }]
                                      Range =
-                                      /root/AttributesInOptionalNamedMemberParameter.fs (3,23--3,35) }],
+                                      /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,23--3,35) }],
                                   true, Some a,
                                   LongIdent (SynLongIdent ([A], [], [None])),
-                                  /root/AttributesInOptionalNamedMemberParameter.fs (3,23--3,41)),
+                                  /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,23--3,41)),
                                LongIdent (SynLongIdent ([B], [], [None])),
-                               /root/AttributesInOptionalNamedMemberParameter.fs (3,23--3,46),
+                               /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,23--3,46),
                                { ArrowRange =
-                                  /root/AttributesInOptionalNamedMemberParameter.fs (3,42--3,44) }),
+                                  /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,42--3,44) }),
                             SynValInfo
                               ([[SynArgInfo
                                    ([{ Attributes =
@@ -57,32 +57,32 @@ ImplFile
                                            ArgExpr =
                                             Const
                                               (Unit,
-                                               /root/AttributesInOptionalNamedMemberParameter.fs (3,25--3,28))
+                                               /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,25--3,28))
                                            Target = None
                                            AppliesToGetterAndSetter = false
                                            Range =
-                                            /root/AttributesInOptionalNamedMemberParameter.fs (3,25--3,28) };
+                                            /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,25--3,28) };
                                          { TypeName =
                                             SynLongIdent ([Bar], [], [None])
                                            ArgExpr =
                                             Const
                                               (Unit,
-                                               /root/AttributesInOptionalNamedMemberParameter.fs (3,30--3,33))
+                                               /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,30--3,33))
                                            Target = None
                                            AppliesToGetterAndSetter = false
                                            Range =
-                                            /root/AttributesInOptionalNamedMemberParameter.fs (3,30--3,33) }]
+                                            /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,30--3,33) }]
                                        Range =
-                                        /root/AttributesInOptionalNamedMemberParameter.fs (3,23--3,35) }],
+                                        /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,23--3,35) }],
                                     true, Some a)]],
                                SynArgInfo ([], false, None)), false, false,
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None, None,
-                            /root/AttributesInOptionalNamedMemberParameter.fs (3,4--3,46),
+                            /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,4--3,46),
                             { LeadingKeyword =
                                AbstractMember
-                                 (/root/AttributesInOptionalNamedMemberParameter.fs (3,4--3,12),
-                                  /root/AttributesInOptionalNamedMemberParameter.fs (3,13--3,19))
+                                 (/root/Type/AttributesInOptionalNamedMemberParameter.fs (3,4--3,12),
+                                  /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,13--3,19))
                               InlineKeyword = None
                               WithKeyword = None
                               EqualsRange = None }),
@@ -92,21 +92,21 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/AttributesInOptionalNamedMemberParameter.fs (3,4--3,46),
+                         /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,4--3,46),
                          { GetSetKeywords = None })],
-                     /root/AttributesInOptionalNamedMemberParameter.fs (3,4--3,46)),
+                     /root/Type/AttributesInOptionalNamedMemberParameter.fs (3,4--3,46)),
                   [], None,
-                  /root/AttributesInOptionalNamedMemberParameter.fs (2,5--3,46),
+                  /root/Type/AttributesInOptionalNamedMemberParameter.fs (2,5--3,46),
                   { LeadingKeyword =
                      Type
-                       /root/AttributesInOptionalNamedMemberParameter.fs (2,0--2,4)
+                       /root/Type/AttributesInOptionalNamedMemberParameter.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/AttributesInOptionalNamedMemberParameter.fs (2,7--2,8)
+                       /root/Type/AttributesInOptionalNamedMemberParameter.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/AttributesInOptionalNamedMemberParameter.fs (2,0--3,46))],
+              /root/Type/AttributesInOptionalNamedMemberParameter.fs (2,0--3,46))],
           PreXmlDocEmpty, [], None,
-          /root/AttributesInOptionalNamedMemberParameter.fs (2,0--4,0),
+          /root/Type/AttributesInOptionalNamedMemberParameter.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs b/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/MultipleSynEnumCaseContainsRangeOfConstant.fs
rename to tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs
diff --git a/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl b/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
new file mode 100644
index 00000000000..5c8312ee9ed
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
@@ -0,0 +1,56 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs", false,
+      QualifiedNameOfFile MultipleSynEnumCaseContainsRangeOfConstant, [], [],
+      [SynModuleOrNamespace
+         ([MultipleSynEnumCaseContainsRangeOfConstant], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Foo],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,5--2,8)),
+                  Simple
+                    (Enum
+                       ([SynEnumCase
+                           ([], SynIdent (One, None),
+                            Const
+                              (Int32 1,
+                               /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,13--3,23)),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,6--3,23),
+                            { BarRange =
+                               Some
+                                 /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,4--3,5)
+                              EqualsRange =
+                               /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,10--3,11) });
+                         SynEnumCase
+                           ([], SynIdent (Two, None),
+                            Const
+                              (Int32 2,
+                               /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (4,12--4,13)),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (4,6--4,13),
+                            { BarRange =
+                               Some
+                                 /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (4,4--4,5)
+                              EqualsRange =
+                               /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (4,10--4,11) })],
+                        /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,4--4,13)),
+                     /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (3,4--4,13)),
+                  [], None,
+                  /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,5--4,13),
+                  { LeadingKeyword =
+                     Type
+                       /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,9--2,10)
+                    WithKeyword = None })],
+              /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,0--4,13))],
+          PreXmlDocEmpty, [], None,
+          /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,0--5,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs b/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs
rename to tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs
diff --git a/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs.bsl b/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl
similarity index 62%
rename from tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs.bsl
rename to tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl
index 1d67d86d3ca..1d8c450a135 100644
--- a/tests/service/data/SyntaxTree/NamedParametersInDelegateType.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/NamedParametersInDelegateType.fs", false,
+     ("/root/Type/NamedParametersInDelegateType.fs", false,
       QualifiedNameOfFile NamedParametersInDelegateType, [], [],
       [SynModuleOrNamespace
          ([NamedParametersInDelegateType], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/NamedParametersInDelegateType.fs (2,5--2,8)),
+                     /root/Type/NamedParametersInDelegateType.fs (2,5--2,8)),
                   ObjectModel
                     (Delegate
                        (Fun
@@ -20,27 +20,27 @@ ImplFile
                                  (SignatureParameter
                                     ([], false, Some a,
                                      LongIdent (SynLongIdent ([A], [], [None])),
-                                     /root/NamedParametersInDelegateType.fs (2,23--2,27)));
+                                     /root/Type/NamedParametersInDelegateType.fs (2,23--2,27)));
                                Star
-                                 /root/NamedParametersInDelegateType.fs (2,28--2,29);
+                                 /root/Type/NamedParametersInDelegateType.fs (2,28--2,29);
                                Type
                                  (SignatureParameter
                                     ([], false, Some b,
                                      LongIdent (SynLongIdent ([B], [], [None])),
-                                     /root/NamedParametersInDelegateType.fs (2,30--2,34)))],
-                              /root/NamedParametersInDelegateType.fs (2,23--2,34)),
+                                     /root/Type/NamedParametersInDelegateType.fs (2,30--2,34)))],
+                              /root/Type/NamedParametersInDelegateType.fs (2,23--2,34)),
                            Fun
                              (SignatureParameter
                                 ([], false, Some c,
                                  LongIdent (SynLongIdent ([C], [], [None])),
-                                 /root/NamedParametersInDelegateType.fs (2,38--2,41)),
+                                 /root/Type/NamedParametersInDelegateType.fs (2,38--2,41)),
                               LongIdent (SynLongIdent ([D], [], [None])),
-                              /root/NamedParametersInDelegateType.fs (2,38--2,46),
+                              /root/Type/NamedParametersInDelegateType.fs (2,38--2,46),
                               { ArrowRange =
-                                 /root/NamedParametersInDelegateType.fs (2,42--2,44) }),
-                           /root/NamedParametersInDelegateType.fs (2,23--2,46),
+                                 /root/Type/NamedParametersInDelegateType.fs (2,42--2,44) }),
+                           /root/Type/NamedParametersInDelegateType.fs (2,23--2,46),
                            { ArrowRange =
-                              /root/NamedParametersInDelegateType.fs (2,35--2,37) }),
+                              /root/Type/NamedParametersInDelegateType.fs (2,35--2,37) }),
                         SynValInfo
                           ([[SynArgInfo ([], false, Some a);
                              SynArgInfo ([], false, Some b)];
@@ -58,35 +58,35 @@ ImplFile
                                         ([], false, Some a,
                                          LongIdent
                                            (SynLongIdent ([A], [], [None])),
-                                         /root/NamedParametersInDelegateType.fs (2,23--2,27)));
+                                         /root/Type/NamedParametersInDelegateType.fs (2,23--2,27)));
                                    Star
-                                     /root/NamedParametersInDelegateType.fs (2,28--2,29);
+                                     /root/Type/NamedParametersInDelegateType.fs (2,28--2,29);
                                    Type
                                      (SignatureParameter
                                         ([], false, Some b,
                                          LongIdent
                                            (SynLongIdent ([B], [], [None])),
-                                         /root/NamedParametersInDelegateType.fs (2,30--2,34)))],
-                                  /root/NamedParametersInDelegateType.fs (2,23--2,34)),
+                                         /root/Type/NamedParametersInDelegateType.fs (2,30--2,34)))],
+                                  /root/Type/NamedParametersInDelegateType.fs (2,23--2,34)),
                                Fun
                                  (SignatureParameter
                                     ([], false, Some c,
                                      LongIdent (SynLongIdent ([C], [], [None])),
-                                     /root/NamedParametersInDelegateType.fs (2,38--2,41)),
+                                     /root/Type/NamedParametersInDelegateType.fs (2,38--2,41)),
                                   LongIdent (SynLongIdent ([D], [], [None])),
-                                  /root/NamedParametersInDelegateType.fs (2,38--2,46),
+                                  /root/Type/NamedParametersInDelegateType.fs (2,38--2,46),
                                   { ArrowRange =
-                                     /root/NamedParametersInDelegateType.fs (2,42--2,44) }),
-                               /root/NamedParametersInDelegateType.fs (2,23--2,46),
+                                     /root/Type/NamedParametersInDelegateType.fs (2,42--2,44) }),
+                               /root/Type/NamedParametersInDelegateType.fs (2,23--2,46),
                                { ArrowRange =
-                                  /root/NamedParametersInDelegateType.fs (2,35--2,37) }),
+                                  /root/Type/NamedParametersInDelegateType.fs (2,35--2,37) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, Some a);
                                  SynArgInfo ([], false, Some b)];
                                 [SynArgInfo ([], false, Some c)]],
                                SynArgInfo ([], false, None)), false, false,
                             PreXmlDocEmpty, None, None,
-                            /root/NamedParametersInDelegateType.fs (2,11--2,46),
+                            /root/Type/NamedParametersInDelegateType.fs (2,11--2,46),
                             { LeadingKeyword = Synthetic
                               InlineKeyword = None
                               WithKeyword = None
@@ -97,18 +97,20 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/NamedParametersInDelegateType.fs (2,11--2,46),
+                         /root/Type/NamedParametersInDelegateType.fs (2,11--2,46),
                          { GetSetKeywords = None })],
-                     /root/NamedParametersInDelegateType.fs (2,11--2,46)), [],
-                  None, /root/NamedParametersInDelegateType.fs (2,5--2,46),
+                     /root/Type/NamedParametersInDelegateType.fs (2,11--2,46)),
+                  [], None,
+                  /root/Type/NamedParametersInDelegateType.fs (2,5--2,46),
                   { LeadingKeyword =
-                     Type /root/NamedParametersInDelegateType.fs (2,0--2,4)
+                     Type /root/Type/NamedParametersInDelegateType.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/NamedParametersInDelegateType.fs (2,9--2,10)
+                     Some
+                       /root/Type/NamedParametersInDelegateType.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/NamedParametersInDelegateType.fs (2,0--2,46))],
+              /root/Type/NamedParametersInDelegateType.fs (2,0--2,46))],
           PreXmlDocEmpty, [], None,
-          /root/NamedParametersInDelegateType.fs (2,0--3,0),
+          /root/Type/NamedParametersInDelegateType.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs b/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs
rename to tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs
diff --git a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
index b85cb7df87c..6d4ec1f7ddf 100644
--- a/tests/service/data/SyntaxTree/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/NestedTypeHasStaticTypeAsLeadingKeyword.fs", false,
+     ("/root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs", false,
       QualifiedNameOfFile NestedTypeHasStaticTypeAsLeadingKeyword, [], [],
       [SynModuleOrNamespace
          ([NestedTypeHasStaticTypeAsLeadingKeyword], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [A],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,5--2,6)),
+                     /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,5--2,6)),
                   ObjectModel
                     (Unspecified,
                      [NestedType
@@ -19,34 +19,34 @@ ImplFile
                               ([], None, [], [B],
                                PreXmlDoc ((3,16), FSharp.Compiler.Xml.XmlDocCollector),
                                false, None,
-                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,16--3,17)),
+                               /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,16--3,17)),
                             ObjectModel
                               (Class, [],
-                               /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (4,20--5,23)),
+                               /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (4,20--5,23)),
                             [], None,
-                            /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,16--5,23),
+                            /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,16--5,23),
                             { LeadingKeyword =
                                StaticType
-                                 (/root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,4--3,10),
-                                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,11--3,15))
+                                 (/root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,4--3,10),
+                                  /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,11--3,15))
                               EqualsRange =
                                Some
-                                 /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,18--3,19)
+                                 /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,18--3,19)
                               WithKeyword = None }), None,
-                         /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,4--6,0))],
-                     /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,4--6,0)),
+                         /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,4--6,0))],
+                     /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (3,4--6,0)),
                   [], None,
-                  /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,5--6,0),
+                  /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,5--6,0),
                   { LeadingKeyword =
                      Type
-                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,0--2,4)
+                       /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,7--2,8)
+                       /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,0--6,0))],
+              /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,0--6,0))],
           PreXmlDocEmpty, [], None,
-          /root/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,0--6,0),
+          /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs b/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs
rename to tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl b/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
similarity index 55%
rename from tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
rename to tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
index ca301d0c57b..cd7a1680ff5 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs", false,
+     ("/root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs", false,
       QualifiedNameOfFile RangeOfAttributeShouldBeIncludedInSynTypeDefn, [], [],
       [SynModuleOrNamespace
          ([RangeOfAttributeShouldBeIncludedInSynTypeDefn], false, AnonModule,
@@ -12,32 +12,32 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,2--2,5))
+                                /root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,2--2,5))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,2--2,5) }]
+                             /root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,2--2,5) }]
                         Range =
-                         /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--2,7) }],
+                         /root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--2,7) }],
                      None, [], [Bar],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (3,5--3,8)),
+                     /root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (3,5--3,8)),
                   ObjectModel
                     (Class, [],
-                     /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (4,4--5,7)),
+                     /root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (4,4--5,7)),
                   [], None,
-                  /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--5,7),
+                  /root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--5,7),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (3,0--3,4)
+                       /root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (3,0--3,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (3,9--3,10)
+                       /root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (3,9--3,10)
                     WithKeyword = None })],
-              /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--5,7))],
+              /root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--5,7))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--6,0),
+          /root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs b/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs
rename to tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs
diff --git a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl b/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
similarity index 53%
rename from tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
rename to tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
index e2a92be6e04..133ba788016 100644
--- a/tests/service/data/SyntaxTree/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs", false,
+     ("/root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs", false,
       QualifiedNameOfFile RangeOfAttributesShouldBeIncludedInRecursiveTypes, [],
       [],
       [SynModuleOrNamespace
@@ -13,31 +13,31 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,2--2,12))
+                                /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,2--2,12))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,2--2,12) };
+                             /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,2--2,12) };
                           { TypeName = SynLongIdent ([NoComparison], [], [None])
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,15--2,27))
+                                /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,15--2,27))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,15--2,27) }]
+                             /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,15--2,27) }]
                         Range =
-                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--2,29) }],
+                         /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--2,29) }],
                      Some
                        (PostfixList
                           ([SynTyparDecl ([], SynTypar (context, None, false));
                             SynTyparDecl ([], SynTypar (a, None, false))], [],
-                           /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,8--3,22))),
+                           /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,8--3,22))),
                      [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      true, None,
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,5--3,8)),
+                     /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,5--3,8)),
                   Simple
                     (Union
                        (None,
@@ -50,39 +50,39 @@ ImplFile
                                     (LongIdent
                                        (SynLongIdent ([ApplyCrate], [], [None])),
                                      Some
-                                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,25--4,26),
+                                       /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,25--4,26),
                                      [Var
                                         (SynTypar (context, None, false),
-                                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,26--4,34));
+                                         /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,26--4,34));
                                       Var
                                         (SynTypar (a, None, false),
-                                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,36--4,38))],
-                                     [/root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,34--4,35)],
+                                         /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,36--4,38))],
+                                     [/root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,34--4,35)],
                                      Some
-                                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,38--4,39),
+                                       /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,38--4,39),
                                      false,
-                                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,15--4,39)),
+                                     /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,15--4,39)),
                                   false,
                                   PreXmlDoc ((4,15), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,15--4,39),
+                                  /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,15--4,39),
                                   { LeadingKeyword = None })],
                             PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,6--4,39),
+                            /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,6--4,39),
                             { BarRange =
                                Some
-                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,4--4,5) })],
-                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,4--4,39)),
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,4--4,39)),
+                                 /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,4--4,5) })],
+                        /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,4--4,39)),
+                     /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (4,4--4,39)),
                   [], None,
-                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--4,39),
+                  /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--4,39),
                   { LeadingKeyword =
                      Type
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,0--3,4)
+                       /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,0--3,4)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,23--3,24)
+                       /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (3,23--3,24)
                     WithKeyword = None });
                SynTypeDefn
                  (SynComponentInfo
@@ -92,79 +92,79 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,6--6,20))
+                                /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,6--6,20))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,6--6,20) };
+                             /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,6--6,20) };
                           { TypeName = SynLongIdent ([NoComparison], [], [None])
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,23--6,35))
+                                /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,23--6,35))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,23--6,35) }]
+                             /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,23--6,35) }]
                         Range =
-                         /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,4--6,37) }],
+                         /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,4--6,37) }],
                      Some
                        (PostfixList
                           ([SynTyparDecl ([], SynTypar (context, None, false));
                             SynTyparDecl ([], SynTypar (a, None, false))], [],
-                           /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,41--6,55))),
+                           /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,41--6,55))),
                      [], [Bar],
                      PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
                      true, None,
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,38--6,41)),
+                     /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,38--6,41)),
                   Simple
                     (Record
                        (Some
                           (Internal
-                             /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (7,4--7,12)),
+                             /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (7,4--7,12)),
                         [SynField
                            ([], false, Some Hash,
                             LongIdent (SynLongIdent ([int], [], [None])), false,
                             PreXmlDoc ((8,8), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,8--8,18),
+                            /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (8,8--8,18),
                             { LeadingKeyword = None });
                          SynField
                            ([], false, Some Foo,
                             App
                               (LongIdent (SynLongIdent ([Foo], [], [None])),
                                Some
-                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,17--9,18),
+                                 /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,17--9,18),
                                [Var
                                   (SynTypar (a, None, false),
-                                   /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,18--9,20));
+                                   /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,18--9,20));
                                 Var
                                   (SynTypar (b, None, false),
-                                   /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,22--9,24))],
-                               [/root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,20--9,21)],
+                                   /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,22--9,24))],
+                               [/root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,20--9,21)],
                                Some
-                                 /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,24--9,25),
+                                 /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,24--9,25),
                                false,
-                               /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,14--9,25)),
+                               /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,14--9,25)),
                             false,
                             PreXmlDoc ((9,8), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,8--9,25),
+                            /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (9,8--9,25),
                             { LeadingKeyword = None })],
-                        /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (7,4--10,5)),
-                     /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (7,4--10,5)),
+                        /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (7,4--10,5)),
+                     /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (7,4--10,5)),
                   [], None,
-                  /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,4--10,5),
+                  /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,4--10,5),
                   { LeadingKeyword =
                      And
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,0--6,3)
+                       /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,0--6,3)
                     EqualsRange =
                      Some
-                       /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,56--6,57)
+                       /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (6,56--6,57)
                     WithKeyword = None })],
-              /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--10,5))],
+              /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--10,5))],
           PreXmlDocEmpty, [], None,
-          /root/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--11,0),
+          /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--11,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs b/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs
rename to tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs
diff --git a/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl b/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
similarity index 52%
rename from tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
rename to tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
index 3457e38256a..261c0a1ba69 100644
--- a/tests/service/data/SyntaxTree/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SingleSynEnumCaseContainsRangeOfConstant.fs", false,
+     ("/root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs", false,
       QualifiedNameOfFile SingleSynEnumCaseContainsRangeOfConstant, [], [],
       [SynModuleOrNamespace
          ([SingleSynEnumCaseContainsRangeOfConstant], false, AnonModule,
@@ -10,33 +10,33 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,5--2,8)),
+                     /root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs (2,5--2,8)),
                   Simple
                     (Enum
                        ([SynEnumCase
                            ([], SynIdent (One, None),
                             Const
                               (Int32 1,
-                               /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,17--2,27)),
+                               /root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs (2,17--2,27)),
                             PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
-                            /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,11--2,27),
+                            /root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs (2,11--2,27),
                             { BarRange = None
                               EqualsRange =
-                               /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,15--2,16) })],
-                        /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,11--2,27)),
-                     /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,11--2,27)),
+                               /root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs (2,15--2,16) })],
+                        /root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs (2,11--2,27)),
+                     /root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs (2,11--2,27)),
                   [], None,
-                  /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,5--2,27),
+                  /root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs (2,5--2,27),
                   { LeadingKeyword =
                      Type
-                       /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,0--2,4)
+                       /root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,9--2,10)
+                       /root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,0--2,27))],
+              /root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs (2,0--2,27))],
           PreXmlDocEmpty, [], None,
-          /root/SingleSynEnumCaseContainsRangeOfConstant.fs (2,0--3,0),
+          /root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs
rename to tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
similarity index 58%
rename from tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
index 6023df3253b..60f6862c75d 100644
--- a/tests/service/data/SyntaxTree/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs", false,
+     ("/root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs",
+      false,
       QualifiedNameOfFile SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword,
       [], [],
       [SynModuleOrNamespace
@@ -12,22 +13,22 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
+                     /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   ObjectModel
                     (Unspecified,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
+                            /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                          None,
                          PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
+                         /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                          { AsKeyword = None });
                       Interface
                         (LongIdent (SynLongIdent ([Bar], [], [None])),
                          Some
-                           /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,18--3,22),
+                           /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,18--3,22),
                          Some
                            [Member
                               (SynBinding
@@ -52,52 +53,52 @@ ImplFile
                                        [Paren
                                           (Const
                                              (Unit,
-                                              /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,19--4,21)),
-                                           /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,19--4,21))],
+                                              /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,19--4,21)),
+                                           /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,19--4,21))],
                                      None,
-                                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,15--4,21)),
+                                     /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,15--4,21)),
                                   None,
                                   Const
                                     (Unit,
-                                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,24--4,26)),
-                                  /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,15--4,21),
+                                     /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,24--4,26)),
+                                  /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,15--4,21),
                                   NoneAtInvisible,
                                   { LeadingKeyword =
                                      Member
-                                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,8--4,14)
+                                       /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,8--4,14)
                                     InlineKeyword = None
                                     EqualsRange =
                                      Some
-                                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,22--4,23) }),
-                               /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,8--4,26))],
-                         /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,4--4,26));
+                                       /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,22--4,23) }),
+                               /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (4,8--4,26))],
+                         /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,4--4,26));
                       Interface
                         (LongIdent (SynLongIdent ([Other], [], [None])), None,
                          None,
-                         /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (5,4--5,19))],
-                     /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,4--5,19)),
+                         /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (5,4--5,19))],
+                     /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (3,4--5,19)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
+                           /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,8--2,10)),
                         None,
                         PreXmlDoc ((2,8), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
+                        /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,5--2,8),
                         { AsKeyword = None })),
-                  /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,5--5,19),
+                  /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,5--5,19),
                   { LeadingKeyword =
                      Type
-                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
+                       /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
+                       /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,0--5,19))],
+              /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,0--5,19))],
           PreXmlDocEmpty, [], None,
-          /root/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,0--6,0),
+          /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
similarity index 50%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
index e3e2fc1c86f..0b8ad451653 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs", false,
+     ("/root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs",
+      false,
       QualifiedNameOfFile
         SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword, [], [],
       [SynModuleOrNamespace
@@ -14,37 +15,37 @@ ImplFile
                             ArgExpr =
                              Const
                                (Unit,
-                                /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,2--2,13))
+                                /root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,2--2,13))
                             Target = None
                             AppliesToGetterAndSetter = false
                             Range =
-                             /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,2--2,13) }]
+                             /root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,2--2,13) }]
                         Range =
-                         /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--2,15) }],
+                         /root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--2,15) }],
                      None, [], [A],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,5--4,6)),
+                     /root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,5--4,6)),
                   Simple
                     (TypeAbbrev
                        (Ok, LongIdent (SynLongIdent ([B], [], [None])),
-                        /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,9--4,10)),
-                     /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,9--4,10)),
+                        /root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,9--4,10)),
+                     /root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,9--4,10)),
                   [], None,
-                  /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--4,10),
+                  /root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--4,10),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,0--4,4)
+                       /root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,0--4,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,7--4,8)
+                       /root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (4,7--4,8)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--4,10))],
+              /root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--4,10))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--5,0),
+          /root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments =
          [LineComment
-            /root/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,0--3,8)] },
+            /root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,0--3,8)] },
       set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
similarity index 57%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
index d15b03bf802..c70f9d30ea4 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs",
+     ("/root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs",
       false,
       QualifiedNameOfFile
         SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword, [], [],
@@ -13,12 +13,12 @@ ImplFile
                     ([], None, [], [Int32],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,5--2,10)),
+                     /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,5--2,10)),
                   ObjectModel
                     (Augmentation
-                       /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,11--2,15),
+                       /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,11--2,15),
                      [],
-                     /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,5--3,21)),
+                     /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,5--3,21)),
                   [Member
                      (SynBinding
                         (None, Normal, false, false, [],
@@ -36,33 +36,33 @@ ImplFile
                          LongIdent
                            (SynLongIdent
                               ([_; Zero],
-                               [/root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,12--3,13)],
+                               [/root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,12--3,13)],
                                [None; None]), None, None, Pats [], None,
-                            /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,11--3,17)),
+                            /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,11--3,17)),
                          None,
                          Const
                            (Int32 0,
-                            /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,20--3,21)),
-                         /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,11--3,17),
+                            /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,20--3,21)),
+                         /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,11--3,17),
                          NoneAtInvisible,
                          { LeadingKeyword =
                             Member
-                              /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,4--3,10)
+                              /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,4--3,10)
                            InlineKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,18--3,19) }),
-                      /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,4--3,21))],
+                              /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,18--3,19) }),
+                      /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (3,4--3,21))],
                   None,
-                  /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,5--3,21),
+                  /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,5--3,21),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
+                       /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange = None
                     WithKeyword = None })],
-              /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,0--3,21))],
+              /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,0--3,21))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,0--4,0),
+          /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
new file mode 100644
index 00000000000..9a4e870e164
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -0,0 +1,58 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs", false,
+      QualifiedNameOfFile SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign, [],
+      [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Bear],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,5--2,9)),
+                  Simple
+                    (Enum
+                       ([SynEnumCase
+                           ([], SynIdent (BlackBear, None),
+                            Const
+                              (Int32 1,
+                               /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,18--3,19)),
+                            PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,6--3,19),
+                            { BarRange =
+                               Some
+                                 /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,4--3,5)
+                              EqualsRange =
+                               /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,16--3,17) });
+                         SynEnumCase
+                           ([], SynIdent (PolarBear, None),
+                            Const
+                              (Int32 2,
+                               /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (4,18--4,19)),
+                            PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (4,6--4,19),
+                            { BarRange =
+                               Some
+                                 /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (4,4--4,5)
+                              EqualsRange =
+                               /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (4,16--4,17) })],
+                        /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,4--4,19)),
+                     /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (3,4--4,19)),
+                  [], None,
+                  /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,5--4,19),
+                  { LeadingKeyword =
+                     Type
+                       /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
+                    EqualsRange =
+                     Some
+                       /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,10--2,11)
+                    WithKeyword = None })],
+              /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,0--4,19))],
+          PreXmlDocEmpty, [], None,
+          /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
similarity index 54%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
index e47439e2e89..1d5e8c5486c 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs",
+     ("/root/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs",
       false,
       QualifiedNameOfFile
         SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign, [], [],
@@ -13,41 +13,41 @@ ImplFile
                     ([], None, [], [Foobar],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,5--2,11)),
+                     /root/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,5--2,11)),
                   ObjectModel
                     (Class,
                      [ImplicitCtor
                         (None, [],
                          SimplePats
                            ([],
-                            /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,12--2,14)),
+                            /root/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,12--2,14)),
                          None,
                          PreXmlDoc ((2,12), FSharp.Compiler.Xml.XmlDocCollector),
-                         /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,5--2,11),
+                         /root/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,5--2,11),
                          { AsKeyword = None })],
-                     /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (3,4--4,7)),
+                     /root/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (3,4--4,7)),
                   [],
                   Some
                     (ImplicitCtor
                        (None, [],
                         SimplePats
                           ([],
-                           /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,12--2,14)),
+                           /root/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,12--2,14)),
                         None,
                         PreXmlDoc ((2,12), FSharp.Compiler.Xml.XmlDocCollector),
-                        /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,5--2,11),
+                        /root/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,5--2,11),
                         { AsKeyword = None })),
-                  /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,5--4,7),
+                  /root/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,5--4,7),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
+                       /root/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,15--2,16)
+                       /root/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,15--2,16)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,0--4,7))],
+              /root/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,0--4,7))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
+          /root/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
similarity index 61%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
index 0f4279be52e..9971bb1c6a9 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs",
+     ("/root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs",
       false,
       QualifiedNameOfFile
         SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign, [],
@@ -14,15 +14,15 @@ ImplFile
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,5--2,6)),
+                     /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,5--2,6)),
                   ObjectModel
                     (Delegate
                        (Fun
                           (LongIdent (SynLongIdent ([string], [], [None])),
                            LongIdent (SynLongIdent ([string], [], [None])),
-                           /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,21--2,37),
+                           /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,21--2,37),
                            { ArrowRange =
-                              /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,28--2,30) }),
+                              /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,28--2,30) }),
                         SynValInfo
                           ([[SynArgInfo ([], false, None)]],
                            SynArgInfo ([], false, None))),
@@ -33,14 +33,14 @@ ImplFile
                             Fun
                               (LongIdent (SynLongIdent ([string], [], [None])),
                                LongIdent (SynLongIdent ([string], [], [None])),
-                               /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,21--2,37),
+                               /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,21--2,37),
                                { ArrowRange =
-                                  /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,28--2,30) }),
+                                  /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,28--2,30) }),
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]],
                                SynArgInfo ([], false, None)), false, false,
                             PreXmlDocEmpty, None, None,
-                            /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,9--2,37),
+                            /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,9--2,37),
                             { LeadingKeyword = Synthetic
                               InlineKeyword = None
                               WithKeyword = None
@@ -51,21 +51,21 @@ ImplFile
                            IsFinal = false
                            GetterOrSetterIsCompilerGenerated = false
                            MemberKind = Member },
-                         /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,9--2,37),
+                         /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,9--2,37),
                          { GetSetKeywords = None })],
-                     /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,9--2,37)),
+                     /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,9--2,37)),
                   [], None,
-                  /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,5--2,37),
+                  /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,5--2,37),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
+                       /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,7--2,8)
+                       /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,0--2,37))],
+              /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,0--2,37))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,0--3,0),
+          /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
similarity index 57%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
index 428f5164613..ab4e74b38c5 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -1,6 +1,7 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs", false,
+     ("/root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs",
+      false,
       QualifiedNameOfFile SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword,
       [], [],
       [SynModuleOrNamespace
@@ -12,7 +13,7 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
+                     /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,5--2,8)),
                   Simple
                     (Record
                        (None,
@@ -21,10 +22,10 @@ ImplFile
                             LongIdent (SynLongIdent ([int], [], [None])), false,
                             PreXmlDoc ((3,6), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (3,6--3,15),
+                            /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (3,6--3,15),
                             { LeadingKeyword = None })],
-                        /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (3,4--3,17)),
-                     /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (3,4--3,17)),
+                        /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (3,4--3,17)),
+                     /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (3,4--3,17)),
                   [Member
                      (SynBinding
                         (None, Normal, false, false, [],
@@ -43,20 +44,20 @@ ImplFile
                          LongIdent
                            (SynLongIdent
                               ([this; Meh],
-                               [/root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,19--5,20)],
+                               [/root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,19--5,20)],
                                [None; None]), None, None,
                             Pats
                               [Paren
                                  (Typed
                                     (Named
                                        (SynIdent (v, None), false, None,
-                                        /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,25--5,26)),
+                                        /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,25--5,26)),
                                      LongIdent
                                        (SynLongIdent ([int], [], [None])),
-                                     /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,25--5,30)),
-                                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,24--5,31))],
+                                     /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,25--5,30)),
+                                  /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,24--5,31))],
                             None,
-                            /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,15--5,31)),
+                            /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,15--5,31)),
                          None,
                          App
                            (NonAtomic, false,
@@ -67,41 +68,41 @@ ImplFile
                                   SynLongIdent
                                     ([op_Addition], [],
                                      [Some (OriginalNotation "+")]), None,
-                                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,43--5,44)),
+                                  /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,43--5,44)),
                                LongIdent
                                  (false,
                                   SynLongIdent
                                     ([this; Bar],
-                                     [/root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,38--5,39)],
+                                     [/root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,38--5,39)],
                                      [None; None]), None,
-                                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,34--5,42)),
-                               /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,34--5,44)),
+                                  /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,34--5,42)),
+                               /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,34--5,44)),
                             Ident v,
-                            /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,34--5,46)),
-                         /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,15--5,31),
+                            /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,34--5,46)),
+                         /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,15--5,31),
                          NoneAtInvisible,
                          { LeadingKeyword =
                             Member
-                              /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,8--5,14)
+                              /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,8--5,14)
                            InlineKeyword = None
                            EqualsRange =
                             Some
-                              /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,32--5,33) }),
-                      /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,8--5,46))],
+                              /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,32--5,33) }),
+                      /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (5,8--5,46))],
                   None,
-                  /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,5--5,46),
+                  /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,5--5,46),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
+                       /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,9--2,10)
+                       /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,9--2,10)
                     WithKeyword =
                      Some
-                       /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,4--4,8) })],
-              /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,0--5,46))],
+                       /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (4,4--4,8) })],
+              /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,0--5,46))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,0--6,0),
+          /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
similarity index 62%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
index fe2dff1220e..4b7410bce73 100644
--- a/tests/service/data/SyntaxTree/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs", false,
+     ("/root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs", false,
       QualifiedNameOfFile SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign,
       [], [],
       [SynModuleOrNamespace
@@ -12,7 +12,7 @@ ImplFile
                     ([], None, [], [Shape],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,5--2,10)),
+                     /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,5--2,10)),
                   Simple
                     (Union
                        (None,
@@ -25,14 +25,14 @@ ImplFile
                                   false,
                                   PreXmlDoc ((3,16), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,16--3,19),
+                                  /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,16--3,19),
                                   { LeadingKeyword = None })],
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,6--3,19),
+                            /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,6--3,19),
                             { BarRange =
                                Some
-                                 /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,4--3,5) });
+                                 /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,4--3,5) });
                          SynUnionCase
                            ([], SynIdent (Rectangle, None),
                             Fields
@@ -42,7 +42,7 @@ ImplFile
                                   false,
                                   PreXmlDoc ((4,19), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (4,19--4,22),
+                                  /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (4,19--4,22),
                                   { LeadingKeyword = None });
                                SynField
                                  ([], false, None,
@@ -50,28 +50,28 @@ ImplFile
                                   false,
                                   PreXmlDoc ((4,25), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (4,25--4,28),
+                                  /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (4,25--4,28),
                                   { LeadingKeyword = None })],
                             PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (4,6--4,28),
+                            /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (4,6--4,28),
                             { BarRange =
                                Some
-                                 /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (4,4--4,5) })],
-                        /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,4--4,28)),
-                     /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,4--4,28)),
+                                 /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (4,4--4,5) })],
+                        /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,4--4,28)),
+                     /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (3,4--4,28)),
                   [], None,
-                  /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,5--4,28),
+                  /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,5--4,28),
                   { LeadingKeyword =
                      Type
-                       /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
+                       /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,0--2,4)
                     EqualsRange =
                      Some
-                       /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,11--2,12)
+                       /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,11--2,12)
                     WithKeyword = None })],
-              /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,0--4,28))],
+              /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,0--4,28))],
           PreXmlDocEmpty, [], None,
-          /root/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
+          /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs
rename to tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
new file mode 100644
index 00000000000..949c267131a
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
@@ -0,0 +1,59 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs",
+      false,
+      QualifiedNameOfFile SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword,
+      [], [],
+      [SynModuleOrNamespace
+         ([SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword], false,
+          AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [A],
+                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,5--4,6)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok, LongIdent (SynLongIdent ([B], [], [None])),
+                        /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,9--4,10)),
+                     /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,9--4,10)),
+                  [], None,
+                  /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (2,0--4,10),
+                  { LeadingKeyword =
+                     Type
+                       /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,0--4,4)
+                    EqualsRange =
+                     Some
+                       /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,7--4,8)
+                    WithKeyword = None });
+               SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [C],
+                     PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,4--5,5)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok, LongIdent (SynLongIdent ([D], [], [None])),
+                        /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,8--5,9)),
+                     /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,8--5,9)),
+                  [], None,
+                  /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,4--5,9),
+                  { LeadingKeyword =
+                     And
+                       /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,0--5,3)
+                    EqualsRange =
+                     Some
+                       /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (5,6--5,7)
+                    WithKeyword = None })],
+              /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (2,0--5,9))],
+          PreXmlDocEmpty, [], None,
+          /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (4,0--6,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment
+            /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,0--3,8)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs b/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeFunHasRangeOfArrow.fs
rename to tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl
new file mode 100644
index 00000000000..84a1e998e39
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl
@@ -0,0 +1,38 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Type/SynTypeFunHasRangeOfArrow.fs", false,
+      QualifiedNameOfFile SynTypeFunHasRangeOfArrow, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeFunHasRangeOfArrow], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [X],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/Type/SynTypeFunHasRangeOfArrow.fs (2,5--2,6)),
+                  Simple
+                    (TypeAbbrev
+                       (Ok,
+                        Fun
+                          (LongIdent (SynLongIdent ([string], [], [None])),
+                           LongIdent (SynLongIdent ([int], [], [None])),
+                           /root/Type/SynTypeFunHasRangeOfArrow.fs (2,9--3,20),
+                           { ArrowRange =
+                              /root/Type/SynTypeFunHasRangeOfArrow.fs (2,16--2,18) }),
+                        /root/Type/SynTypeFunHasRangeOfArrow.fs (2,9--3,20)),
+                     /root/Type/SynTypeFunHasRangeOfArrow.fs (2,9--3,20)), [],
+                  None, /root/Type/SynTypeFunHasRangeOfArrow.fs (2,5--3,20),
+                  { LeadingKeyword =
+                     Type /root/Type/SynTypeFunHasRangeOfArrow.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/Type/SynTypeFunHasRangeOfArrow.fs (2,7--2,8)
+                    WithKeyword = None })],
+              /root/Type/SynTypeFunHasRangeOfArrow.fs (2,0--3,20))],
+          PreXmlDocEmpty, [], None,
+          /root/Type/SynTypeFunHasRangeOfArrow.fs (2,0--4,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments =
+         [LineComment /root/Type/SynTypeFunHasRangeOfArrow.fs (2,19--2,59)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs
rename to tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl
similarity index 50%
rename from tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs.bsl
rename to tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl
index 7ba5c5e1f67..afbf5bfe691 100644
--- a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynTypeTupleWithStruct.fs", false,
+     ("/root/Type/SynTypeTupleWithStruct.fs", false,
       QualifiedNameOfFile SynTypeTupleWithStruct, [], [],
       [SynModuleOrNamespace
          ([SynTypeTupleWithStruct], false, AnonModule,
@@ -11,36 +11,38 @@ ImplFile
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
                     (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
-                  Wild /root/SynTypeTupleWithStruct.fs (2,4--2,5),
+                  Wild /root/Type/SynTypeTupleWithStruct.fs (2,4--2,5),
                   Some
                     (SynBindingReturnInfo
                        (Tuple
                           (true,
                            [Type (LongIdent (SynLongIdent ([int], [], [None])));
-                            Star /root/SynTypeTupleWithStruct.fs (2,19--2,20);
+                            Star
+                              /root/Type/SynTypeTupleWithStruct.fs (2,19--2,20);
                             Type (LongIdent (SynLongIdent ([int], [], [None])))],
-                           /root/SynTypeTupleWithStruct.fs (2,7--2,25)),
-                        /root/SynTypeTupleWithStruct.fs (2,7--2,25), [],
+                           /root/Type/SynTypeTupleWithStruct.fs (2,7--2,25)),
+                        /root/Type/SynTypeTupleWithStruct.fs (2,7--2,25), [],
                         { ColonRange =
-                           Some /root/SynTypeTupleWithStruct.fs (2,5--2,6) })),
+                           Some /root/Type/SynTypeTupleWithStruct.fs (2,5--2,6) })),
                   Typed
-                    (Const (Unit, /root/SynTypeTupleWithStruct.fs (2,28--2,30)),
+                    (Const
+                       (Unit, /root/Type/SynTypeTupleWithStruct.fs (2,28--2,30)),
                      Tuple
                        (true,
                         [Type (LongIdent (SynLongIdent ([int], [], [None])));
-                         Star /root/SynTypeTupleWithStruct.fs (2,19--2,20);
+                         Star /root/Type/SynTypeTupleWithStruct.fs (2,19--2,20);
                          Type (LongIdent (SynLongIdent ([int], [], [None])))],
-                        /root/SynTypeTupleWithStruct.fs (2,7--2,25)),
-                     /root/SynTypeTupleWithStruct.fs (2,28--2,30)),
-                  /root/SynTypeTupleWithStruct.fs (2,4--2,5),
-                  Yes /root/SynTypeTupleWithStruct.fs (2,0--2,30),
+                        /root/Type/SynTypeTupleWithStruct.fs (2,7--2,25)),
+                     /root/Type/SynTypeTupleWithStruct.fs (2,28--2,30)),
+                  /root/Type/SynTypeTupleWithStruct.fs (2,4--2,5),
+                  Yes /root/Type/SynTypeTupleWithStruct.fs (2,0--2,30),
                   { LeadingKeyword =
-                     Let /root/SynTypeTupleWithStruct.fs (2,0--2,3)
+                     Let /root/Type/SynTypeTupleWithStruct.fs (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange =
-                     Some /root/SynTypeTupleWithStruct.fs (2,26--2,27) })],
-              /root/SynTypeTupleWithStruct.fs (2,0--2,30))], PreXmlDocEmpty, [],
-          None, /root/SynTypeTupleWithStruct.fs (2,0--3,0),
+                     Some /root/Type/SynTypeTupleWithStruct.fs (2,26--2,27) })],
+              /root/Type/SynTypeTupleWithStruct.fs (2,0--2,30))], PreXmlDocEmpty,
+          [], None, /root/Type/SynTypeTupleWithStruct.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynTypeTupleWithStruct,Recovery.fs
rename to tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl
new file mode 100644
index 00000000000..8d0b757f195
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl
@@ -0,0 +1,54 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/Type/SynTypeTupleWithStructRecovery.fs", false,
+      QualifiedNameOfFile SynTypeTupleWithStructRecovery, [], [],
+      [SynModuleOrNamespace
+         ([SynTypeTupleWithStructRecovery], false, AnonModule,
+          [Let
+             (false,
+              [SynBinding
+                 (None, Normal, false, false, [],
+                  PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                  SynValData
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild /root/Type/SynTypeTupleWithStructRecovery.fs (2,4--2,5),
+                  Some
+                    (SynBindingReturnInfo
+                       (Tuple
+                          (true,
+                           [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                            Star
+                              /root/Type/SynTypeTupleWithStructRecovery.fs (2,19--2,20);
+                            Type (LongIdent (SynLongIdent ([int], [], [None])))],
+                           /root/Type/SynTypeTupleWithStructRecovery.fs (2,7--2,24)),
+                        /root/Type/SynTypeTupleWithStructRecovery.fs (2,7--2,26),
+                        [],
+                        { ColonRange =
+                           Some
+                             /root/Type/SynTypeTupleWithStructRecovery.fs (2,5--2,6) })),
+                  Typed
+                    (Const
+                       (Unit,
+                        /root/Type/SynTypeTupleWithStructRecovery.fs (2,27--2,29)),
+                     Tuple
+                       (true,
+                        [Type (LongIdent (SynLongIdent ([int], [], [None])));
+                         Star
+                           /root/Type/SynTypeTupleWithStructRecovery.fs (2,19--2,20);
+                         Type (LongIdent (SynLongIdent ([int], [], [None])))],
+                        /root/Type/SynTypeTupleWithStructRecovery.fs (2,7--2,24)),
+                     /root/Type/SynTypeTupleWithStructRecovery.fs (2,27--2,29)),
+                  /root/Type/SynTypeTupleWithStructRecovery.fs (2,4--2,5),
+                  Yes /root/Type/SynTypeTupleWithStructRecovery.fs (2,0--2,29),
+                  { LeadingKeyword =
+                     Let /root/Type/SynTypeTupleWithStructRecovery.fs (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange =
+                     Some
+                       /root/Type/SynTypeTupleWithStructRecovery.fs (2,25--2,26) })],
+              /root/Type/SynTypeTupleWithStructRecovery.fs (2,0--2,29))],
+          PreXmlDocEmpty, [], None,
+          /root/Type/SynTypeTupleWithStructRecovery.fs (2,0--3,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs b/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs
rename to tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs
diff --git a/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl
similarity index 61%
rename from tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs.bsl
rename to tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl
index ad7160fe3f6..0c27b0e7e9f 100644
--- a/tests/service/data/SyntaxTree/MultipleSynUnionCasesHaveBarRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/MultipleSynUnionCasesHaveBarRange.fs", false,
+     ("/root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs", false,
       QualifiedNameOfFile MultipleSynUnionCasesHaveBarRange, [], [],
       [SynModuleOrNamespace
          ([MultipleSynUnionCasesHaveBarRange], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/MultipleSynUnionCasesHaveBarRange.fs (2,5--2,8)),
+                     /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (2,5--2,8)),
                   Simple
                     (Union
                        (None,
@@ -23,14 +23,14 @@ ImplFile
                                     (SynLongIdent ([string], [], [None])), false,
                                   PreXmlDoc ((3,13), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/MultipleSynUnionCasesHaveBarRange.fs (3,13--3,19),
+                                  /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (3,13--3,19),
                                   { LeadingKeyword = None })],
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/MultipleSynUnionCasesHaveBarRange.fs (3,6--3,19),
+                            /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (3,6--3,19),
                             { BarRange =
                                Some
-                                 /root/MultipleSynUnionCasesHaveBarRange.fs (3,4--3,5) });
+                                 /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (3,4--3,5) });
                          SynUnionCase
                            ([], SynIdent (Bear, None),
                             Fields
@@ -40,25 +40,28 @@ ImplFile
                                   false,
                                   PreXmlDoc ((4,14), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/MultipleSynUnionCasesHaveBarRange.fs (4,14--4,17),
+                                  /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (4,14--4,17),
                                   { LeadingKeyword = None })],
                             PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/MultipleSynUnionCasesHaveBarRange.fs (4,6--4,17),
+                            /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (4,6--4,17),
                             { BarRange =
                                Some
-                                 /root/MultipleSynUnionCasesHaveBarRange.fs (4,4--4,5) })],
-                        /root/MultipleSynUnionCasesHaveBarRange.fs (3,4--4,17)),
-                     /root/MultipleSynUnionCasesHaveBarRange.fs (3,4--4,17)), [],
-                  None, /root/MultipleSynUnionCasesHaveBarRange.fs (2,5--4,17),
+                                 /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (4,4--4,5) })],
+                        /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (3,4--4,17)),
+                     /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (3,4--4,17)),
+                  [], None,
+                  /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (2,5--4,17),
                   { LeadingKeyword =
-                     Type /root/MultipleSynUnionCasesHaveBarRange.fs (2,0--2,4)
+                     Type
+                       /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/MultipleSynUnionCasesHaveBarRange.fs (2,9--2,10)
+                     Some
+                       /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/MultipleSynUnionCasesHaveBarRange.fs (2,0--4,17))],
+              /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (2,0--4,17))],
           PreXmlDocEmpty, [], None,
-          /root/MultipleSynUnionCasesHaveBarRange.fs (2,0--5,0),
+          /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs b/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/PrivateKeywordHasRange.fs
rename to tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs
diff --git a/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl
new file mode 100644
index 00000000000..b8ffb3a68c7
--- /dev/null
+++ b/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl
@@ -0,0 +1,56 @@
+ImplFile
+  (ParsedImplFileInput
+     ("/root/UnionCase/PrivateKeywordHasRange.fs", false,
+      QualifiedNameOfFile PrivateKeywordHasRange, [], [],
+      [SynModuleOrNamespace
+         ([PrivateKeywordHasRange], false, AnonModule,
+          [Types
+             ([SynTypeDefn
+                 (SynComponentInfo
+                    ([], None, [], [Currency],
+                     PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
+                     false, None,
+                     /root/UnionCase/PrivateKeywordHasRange.fs (2,5--2,13)),
+                  Simple
+                    (Union
+                       (Some
+                          (Private
+                             /root/UnionCase/PrivateKeywordHasRange.fs (7,4--7,11)),
+                        [SynUnionCase
+                           ([], SynIdent (Code, None),
+                            Fields
+                              [SynField
+                                 ([], false, None,
+                                  LongIdent
+                                    (SynLongIdent ([string], [], [None])), false,
+                                  PreXmlDoc ((9,14), FSharp.Compiler.Xml.XmlDocCollector),
+                                  None,
+                                  /root/UnionCase/PrivateKeywordHasRange.fs (9,14--9,20),
+                                  { LeadingKeyword = None })],
+                            PreXmlDoc ((9,4), FSharp.Compiler.Xml.XmlDocCollector),
+                            None,
+                            /root/UnionCase/PrivateKeywordHasRange.fs (9,6--9,20),
+                            { BarRange =
+                               Some
+                                 /root/UnionCase/PrivateKeywordHasRange.fs (9,4--9,5) })],
+                        /root/UnionCase/PrivateKeywordHasRange.fs (7,4--9,20)),
+                     /root/UnionCase/PrivateKeywordHasRange.fs (7,4--9,20)), [],
+                  None, /root/UnionCase/PrivateKeywordHasRange.fs (2,5--9,20),
+                  { LeadingKeyword =
+                     Type /root/UnionCase/PrivateKeywordHasRange.fs (2,0--2,4)
+                    EqualsRange =
+                     Some /root/UnionCase/PrivateKeywordHasRange.fs (2,14--2,15)
+                    WithKeyword = None })],
+              /root/UnionCase/PrivateKeywordHasRange.fs (2,0--9,20))],
+          PreXmlDocEmpty, [], None,
+          /root/UnionCase/PrivateKeywordHasRange.fs (2,0--10,0),
+          { LeadingKeyword = None })], (true, false),
+      { ConditionalDirectives =
+         [If
+            (Not (Ident "FABLE_COMPILER"),
+             /root/UnionCase/PrivateKeywordHasRange.fs (6,0--6,19));
+          EndIf /root/UnionCase/PrivateKeywordHasRange.fs (8,0--8,6)]
+        CodeComments =
+         [LineComment /root/UnionCase/PrivateKeywordHasRange.fs (3,4--3,67);
+          LineComment /root/UnionCase/PrivateKeywordHasRange.fs (4,4--4,56)] },
+      set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs
rename to tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs
diff --git a/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl
similarity index 58%
rename from tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs.bsl
rename to tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl
index bbeedf2626a..04e5949e8c5 100644
--- a/tests/service/data/SyntaxTree/SingleSynUnionCaseHasBarRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SingleSynUnionCaseHasBarRange.fs", false,
+     ("/root/UnionCase/SingleSynUnionCaseHasBarRange.fs", false,
       QualifiedNameOfFile SingleSynUnionCaseHasBarRange, [], [],
       [SynModuleOrNamespace
          ([SingleSynUnionCaseHasBarRange], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SingleSynUnionCaseHasBarRange.fs (2,5--2,8)),
+                     /root/UnionCase/SingleSynUnionCaseHasBarRange.fs (2,5--2,8)),
                   Simple
                     (Union
                        (None,
@@ -23,25 +23,28 @@ ImplFile
                                     (SynLongIdent ([string], [], [None])), false,
                                   PreXmlDoc ((2,20), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SingleSynUnionCaseHasBarRange.fs (2,20--2,26),
+                                  /root/UnionCase/SingleSynUnionCaseHasBarRange.fs (2,20--2,26),
                                   { LeadingKeyword = None })],
                             PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SingleSynUnionCaseHasBarRange.fs (2,13--2,26),
+                            /root/UnionCase/SingleSynUnionCaseHasBarRange.fs (2,13--2,26),
                             { BarRange =
                                Some
-                                 /root/SingleSynUnionCaseHasBarRange.fs (2,11--2,12) })],
-                        /root/SingleSynUnionCaseHasBarRange.fs (2,11--2,26)),
-                     /root/SingleSynUnionCaseHasBarRange.fs (2,11--2,26)), [],
-                  None, /root/SingleSynUnionCaseHasBarRange.fs (2,5--2,26),
+                                 /root/UnionCase/SingleSynUnionCaseHasBarRange.fs (2,11--2,12) })],
+                        /root/UnionCase/SingleSynUnionCaseHasBarRange.fs (2,11--2,26)),
+                     /root/UnionCase/SingleSynUnionCaseHasBarRange.fs (2,11--2,26)),
+                  [], None,
+                  /root/UnionCase/SingleSynUnionCaseHasBarRange.fs (2,5--2,26),
                   { LeadingKeyword =
-                     Type /root/SingleSynUnionCaseHasBarRange.fs (2,0--2,4)
+                     Type
+                       /root/UnionCase/SingleSynUnionCaseHasBarRange.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/SingleSynUnionCaseHasBarRange.fs (2,9--2,10)
+                     Some
+                       /root/UnionCase/SingleSynUnionCaseHasBarRange.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SingleSynUnionCaseHasBarRange.fs (2,0--2,26))],
+              /root/UnionCase/SingleSynUnionCaseHasBarRange.fs (2,0--2,26))],
           PreXmlDocEmpty, [], None,
-          /root/SingleSynUnionCaseHasBarRange.fs (2,0--3,0),
+          /root/UnionCase/SingleSynUnionCaseHasBarRange.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs
rename to tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs
diff --git a/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl
similarity index 60%
rename from tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs.bsl
rename to tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl
index 8cf71d67857..c043b8f2f2b 100644
--- a/tests/service/data/SyntaxTree/SingleSynUnionCaseWithoutBar.fs.bsl
+++ b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SingleSynUnionCaseWithoutBar.fs", false,
+     ("/root/UnionCase/SingleSynUnionCaseWithoutBar.fs", false,
       QualifiedNameOfFile SingleSynUnionCaseWithoutBar, [], [],
       [SynModuleOrNamespace
          ([SingleSynUnionCaseWithoutBar], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/SingleSynUnionCaseWithoutBar.fs (2,5--2,8)),
+                     /root/UnionCase/SingleSynUnionCaseWithoutBar.fs (2,5--2,8)),
                   Simple
                     (Union
                        (None,
@@ -23,23 +23,26 @@ ImplFile
                                     (SynLongIdent ([string], [], [None])), false,
                                   PreXmlDoc ((2,18), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/SingleSynUnionCaseWithoutBar.fs (2,18--2,24),
+                                  /root/UnionCase/SingleSynUnionCaseWithoutBar.fs (2,18--2,24),
                                   { LeadingKeyword = None })],
                             PreXmlDoc ((2,11), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/SingleSynUnionCaseWithoutBar.fs (2,11--2,24),
+                            /root/UnionCase/SingleSynUnionCaseWithoutBar.fs (2,11--2,24),
                             { BarRange = None })],
-                        /root/SingleSynUnionCaseWithoutBar.fs (2,11--2,24)),
-                     /root/SingleSynUnionCaseWithoutBar.fs (2,11--2,24)), [],
-                  None, /root/SingleSynUnionCaseWithoutBar.fs (2,5--2,24),
+                        /root/UnionCase/SingleSynUnionCaseWithoutBar.fs (2,11--2,24)),
+                     /root/UnionCase/SingleSynUnionCaseWithoutBar.fs (2,11--2,24)),
+                  [], None,
+                  /root/UnionCase/SingleSynUnionCaseWithoutBar.fs (2,5--2,24),
                   { LeadingKeyword =
-                     Type /root/SingleSynUnionCaseWithoutBar.fs (2,0--2,4)
+                     Type
+                       /root/UnionCase/SingleSynUnionCaseWithoutBar.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/SingleSynUnionCaseWithoutBar.fs (2,9--2,10)
+                     Some
+                       /root/UnionCase/SingleSynUnionCaseWithoutBar.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/SingleSynUnionCaseWithoutBar.fs (2,0--2,24))],
+              /root/UnionCase/SingleSynUnionCaseWithoutBar.fs (2,0--2,24))],
           PreXmlDocEmpty, [], None,
-          /root/SingleSynUnionCaseWithoutBar.fs (2,0--3,0),
+          /root/UnionCase/SingleSynUnionCaseWithoutBar.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs b/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs
rename to tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs
diff --git a/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl
similarity index 55%
rename from tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs.bsl
rename to tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl
index bb58f4d07cd..eef2d79488c 100644
--- a/tests/service/data/SyntaxTree/SynUnionCaseKindFullType.fs.bsl
+++ b/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/SynUnionCaseKindFullType.fs", false,
+     ("/root/UnionCase/SynUnionCaseKindFullType.fs", false,
       QualifiedNameOfFile SynUnionCaseKindFullType, [], [],
       [SynModuleOrNamespace
          ([SynUnionCaseKindFullType], false, AnonModule,
@@ -9,7 +9,8 @@ ImplFile
                  (SynComponentInfo
                     ([], None, [], [X],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/SynUnionCaseKindFullType.fs (2,5--2,6)),
+                     false, None,
+                     /root/UnionCase/SynUnionCaseKindFullType.fs (2,5--2,6)),
                   Simple
                     (Union
                        (None,
@@ -22,29 +23,33 @@ ImplFile
                                      (LongIdent
                                         (SynLongIdent ([int], [], [None])));
                                    Star
-                                     /root/SynUnionCaseKindFullType.fs (3,13--3,14);
+                                     /root/UnionCase/SynUnionCaseKindFullType.fs (3,13--3,14);
                                    Type
                                      (SignatureParameter
                                         ([], false, Some z,
                                          LongIdent
                                            (SynLongIdent ([int], [], [None])),
-                                         /root/SynUnionCaseKindFullType.fs (3,15--3,20)))],
-                                  /root/SynUnionCaseKindFullType.fs (3,9--3,20)),
+                                         /root/UnionCase/SynUnionCaseKindFullType.fs (3,15--3,20)))],
+                                  /root/UnionCase/SynUnionCaseKindFullType.fs (3,9--3,20)),
                                SynValInfo ([], SynArgInfo ([], false, None))),
                             PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            None, /root/SynUnionCaseKindFullType.fs (3,6--3,20),
+                            None,
+                            /root/UnionCase/SynUnionCaseKindFullType.fs (3,6--3,20),
                             { BarRange =
-                               Some /root/SynUnionCaseKindFullType.fs (3,4--3,5) })],
-                        /root/SynUnionCaseKindFullType.fs (3,4--3,20)),
-                     /root/SynUnionCaseKindFullType.fs (3,4--3,20)), [], None,
-                  /root/SynUnionCaseKindFullType.fs (2,5--3,20),
+                               Some
+                                 /root/UnionCase/SynUnionCaseKindFullType.fs (3,4--3,5) })],
+                        /root/UnionCase/SynUnionCaseKindFullType.fs (3,4--3,20)),
+                     /root/UnionCase/SynUnionCaseKindFullType.fs (3,4--3,20)),
+                  [], None,
+                  /root/UnionCase/SynUnionCaseKindFullType.fs (2,5--3,20),
                   { LeadingKeyword =
-                     Type /root/SynUnionCaseKindFullType.fs (2,0--2,4)
+                     Type /root/UnionCase/SynUnionCaseKindFullType.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/SynUnionCaseKindFullType.fs (2,7--2,8)
+                     Some /root/UnionCase/SynUnionCaseKindFullType.fs (2,7--2,8)
                     WithKeyword = None })],
-              /root/SynUnionCaseKindFullType.fs (2,0--3,20))], PreXmlDocEmpty,
-          [], None, /root/SynUnionCaseKindFullType.fs (2,0--4,0),
+              /root/UnionCase/SynUnionCaseKindFullType.fs (2,0--3,20))],
+          PreXmlDocEmpty, [], None,
+          /root/UnionCase/SynUnionCaseKindFullType.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs b/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs
similarity index 100%
rename from tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs
rename to tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs
diff --git a/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl
similarity index 61%
rename from tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs.bsl
rename to tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl
index 64e44ef1d32..9be48963645 100644
--- a/tests/service/data/SyntaxTree/UnionCaseFieldsCanHaveComments.fs.bsl
+++ b/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl
@@ -1,6 +1,6 @@
 ImplFile
   (ParsedImplFileInput
-     ("/root/UnionCaseFieldsCanHaveComments.fs", false,
+     ("/root/UnionCase/UnionCaseFieldsCanHaveComments.fs", false,
       QualifiedNameOfFile UnionCaseFieldsCanHaveComments, [], [],
       [SynModuleOrNamespace
          ([UnionCaseFieldsCanHaveComments], false, AnonModule,
@@ -10,7 +10,7 @@ ImplFile
                     ([], None, [], [Foo],
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      false, None,
-                     /root/UnionCaseFieldsCanHaveComments.fs (2,5--2,8)),
+                     /root/UnionCase/UnionCaseFieldsCanHaveComments.fs (2,5--2,8)),
                   Simple
                     (Union
                        (None,
@@ -23,7 +23,7 @@ ImplFile
                                     (SynLongIdent ([string], [], [None])), false,
                                   PreXmlDoc ((6,2), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/UnionCaseFieldsCanHaveComments.fs (5,2--6,15),
+                                  /root/UnionCase/UnionCaseFieldsCanHaveComments.fs (5,2--6,15),
                                   { LeadingKeyword = None });
                                SynField
                                  ([], false, None,
@@ -31,25 +31,28 @@ ImplFile
                                   false,
                                   PreXmlDoc ((8,2), FSharp.Compiler.Xml.XmlDocCollector),
                                   None,
-                                  /root/UnionCaseFieldsCanHaveComments.fs (7,2--8,6),
+                                  /root/UnionCase/UnionCaseFieldsCanHaveComments.fs (7,2--8,6),
                                   { LeadingKeyword = None })],
                             PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                             None,
-                            /root/UnionCaseFieldsCanHaveComments.fs (3,0--8,6),
+                            /root/UnionCase/UnionCaseFieldsCanHaveComments.fs (3,0--8,6),
                             { BarRange =
                                Some
-                                 /root/UnionCaseFieldsCanHaveComments.fs (4,0--4,1) })],
-                        /root/UnionCaseFieldsCanHaveComments.fs (3,0--8,6)),
-                     /root/UnionCaseFieldsCanHaveComments.fs (3,0--8,6)), [],
-                  None, /root/UnionCaseFieldsCanHaveComments.fs (2,5--8,6),
+                                 /root/UnionCase/UnionCaseFieldsCanHaveComments.fs (4,0--4,1) })],
+                        /root/UnionCase/UnionCaseFieldsCanHaveComments.fs (3,0--8,6)),
+                     /root/UnionCase/UnionCaseFieldsCanHaveComments.fs (3,0--8,6)),
+                  [], None,
+                  /root/UnionCase/UnionCaseFieldsCanHaveComments.fs (2,5--8,6),
                   { LeadingKeyword =
-                     Type /root/UnionCaseFieldsCanHaveComments.fs (2,0--2,4)
+                     Type
+                       /root/UnionCase/UnionCaseFieldsCanHaveComments.fs (2,0--2,4)
                     EqualsRange =
-                     Some /root/UnionCaseFieldsCanHaveComments.fs (2,9--2,10)
+                     Some
+                       /root/UnionCase/UnionCaseFieldsCanHaveComments.fs (2,9--2,10)
                     WithKeyword = None })],
-              /root/UnionCaseFieldsCanHaveComments.fs (2,0--8,6))],
+              /root/UnionCase/UnionCaseFieldsCanHaveComments.fs (2,0--8,6))],
           PreXmlDocEmpty, [], None,
-          /root/UnionCaseFieldsCanHaveComments.fs (2,0--9,0),
+          /root/UnionCase/UnionCaseFieldsCanHaveComments.fs (2,0--9,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UseKeyword.fs.bsl b/tests/service/data/SyntaxTree/UseKeyword.fs.bsl
deleted file mode 100644
index b9bb75fb459..00000000000
--- a/tests/service/data/SyntaxTree/UseKeyword.fs.bsl
+++ /dev/null
@@ -1,34 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/UseKeyword.fs", false, QualifiedNameOfFile UseKeyword, [], [],
-      [SynModuleOrNamespace
-         ([UseKeyword], false, AnonModule,
-          [Expr
-             (Do
-                (LetOrUse
-                   (false, true,
-                    [SynBinding
-                       (None, Normal, false, false, [],
-                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                        SynValData
-                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None),
-                        Named
-                          (SynIdent (x, None), false, None,
-                           /root/UseKeyword.fs (3,8--3,9)), None,
-                        App
-                          (Atomic, false, Ident X,
-                           Const (Unit, /root/UseKeyword.fs (3,13--3,15)),
-                           /root/UseKeyword.fs (3,12--3,15)),
-                        /root/UseKeyword.fs (3,8--3,9),
-                        Yes /root/UseKeyword.fs (3,4--3,15),
-                        { LeadingKeyword = Use /root/UseKeyword.fs (3,4--3,7)
-                          InlineKeyword = None
-                          EqualsRange = Some /root/UseKeyword.fs (3,10--3,11) })],
-                    Const (Unit, /root/UseKeyword.fs (4,4--4,6)),
-                    /root/UseKeyword.fs (3,4--4,6), { InKeyword = None }),
-                 /root/UseKeyword.fs (2,0--4,6)), /root/UseKeyword.fs (2,0--4,6))],
-          PreXmlDocEmpty, [], None, /root/UseKeyword.fs (2,0--5,0),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/UseRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/UseRecKeyword.fs.bsl
deleted file mode 100644
index f05751516d2..00000000000
--- a/tests/service/data/SyntaxTree/UseRecKeyword.fs.bsl
+++ /dev/null
@@ -1,37 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/UseRecKeyword.fs", false, QualifiedNameOfFile UseRecKeyword, [], [],
-      [SynModuleOrNamespace
-         ([UseRecKeyword], false, AnonModule,
-          [Expr
-             (Do
-                (LetOrUse
-                   (true, true,
-                    [SynBinding
-                       (None, Normal, false, false, [],
-                        PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
-                        SynValData
-                          (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None),
-                        Named
-                          (SynIdent (x, None), false, None,
-                           /root/UseRecKeyword.fs (3,12--3,13)), None,
-                        App
-                          (Atomic, false, Ident X,
-                           Const (Unit, /root/UseRecKeyword.fs (3,17--3,19)),
-                           /root/UseRecKeyword.fs (3,16--3,19)),
-                        /root/UseRecKeyword.fs (3,12--3,13),
-                        Yes /root/UseRecKeyword.fs (3,4--3,19),
-                        { LeadingKeyword =
-                           UseRec
-                             (/root/UseRecKeyword.fs (3,4--3,7),
-                              /root/UseRecKeyword.fs (3,8--3,11))
-                          InlineKeyword = None
-                          EqualsRange = Some /root/UseRecKeyword.fs (3,14--3,15) })],
-                    Const (Unit, /root/UseRecKeyword.fs (4,4--4,6)),
-                    /root/UseRecKeyword.fs (3,4--4,6), { InKeyword = None }),
-                 /root/UseRecKeyword.fs (2,0--4,6)),
-              /root/UseRecKeyword.fs (2,0--4,6))], PreXmlDocEmpty, [], None,
-          /root/UseRecKeyword.fs (2,0--5,0), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/InlineKeyword.fsi b/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi
similarity index 100%
rename from tests/service/data/SyntaxTree/InlineKeyword.fsi
rename to tests/service/data/SyntaxTree/Val/InlineKeyword.fsi
diff --git a/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl b/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl
new file mode 100644
index 00000000000..1a220189c43
--- /dev/null
+++ b/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl
@@ -0,0 +1,27 @@
+SigFile
+  (ParsedSigFileInput
+     ("/root/Val/InlineKeyword.fsi", QualifiedNameOfFile InlineKeyword, [], [],
+      [SynModuleOrNamespaceSig
+         ([X], false, DeclaredNamespace,
+          [Val
+             (SynValSig
+                ([], SynIdent (meh, None), SynValTyparDecls (None, true),
+                 Fun
+                   (LongIdent (SynLongIdent ([int], [], [None])),
+                    LongIdent (SynLongIdent ([int], [], [None])),
+                    /root/Val/InlineKeyword.fsi (4,16--4,26),
+                    { ArrowRange = /root/Val/InlineKeyword.fsi (4,20--4,22) }),
+                 SynValInfo
+                   ([[SynArgInfo ([], false, None)]],
+                    SynArgInfo ([], false, None)), true, false,
+                 PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector), None,
+                 None, /root/Val/InlineKeyword.fsi (4,0--4,26),
+                 { LeadingKeyword = Val /root/Val/InlineKeyword.fsi (4,0--4,3)
+                   InlineKeyword = Some /root/Val/InlineKeyword.fsi (4,4--4,10)
+                   WithKeyword = None
+                   EqualsRange = None }),
+              /root/Val/InlineKeyword.fsi (4,0--4,26))], PreXmlDocEmpty, [],
+          None, /root/Val/InlineKeyword.fsi (2,0--4,26),
+          { LeadingKeyword = Namespace /root/Val/InlineKeyword.fsi (2,0--2,9) })],
+      { ConditionalDirectives = []
+        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/ValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ValKeyword.fsi.bsl
deleted file mode 100644
index ddaf5b07bbf..00000000000
--- a/tests/service/data/SyntaxTree/ValKeyword.fsi.bsl
+++ /dev/null
@@ -1,31 +0,0 @@
-SigFile
-  (ParsedSigFileInput
-     ("/root/ValKeyword.fsi", QualifiedNameOfFile ValKeyword, [], [],
-      [SynModuleOrNamespaceSig
-         ([X], false, DeclaredNamespace,
-          [Types
-             ([SynTypeDefnSig
-                 (SynComponentInfo
-                    ([], None, [], [Y],
-                     PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
-                     false, None, /root/ValKeyword.fsi (4,5--4,6)),
-                  ObjectModel
-                    (Unspecified,
-                     [ValField
-                        (SynField
-                           ([], false, Some F,
-                            LongIdent (SynLongIdent ([int], [], [None])), false,
-                            PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
-                            None, /root/ValKeyword.fsi (5,4--5,15),
-                            { LeadingKeyword =
-                               Some (Val /root/ValKeyword.fsi (5,4--5,7)) }),
-                         /root/ValKeyword.fsi (5,4--5,15))],
-                     /root/ValKeyword.fsi (5,4--5,15)), [],
-                  /root/ValKeyword.fsi (4,5--5,15),
-                  { LeadingKeyword = Type /root/ValKeyword.fsi (4,0--4,4)
-                    EqualsRange = Some /root/ValKeyword.fsi (4,7--4,8)
-                    WithKeyword = None })], /root/ValKeyword.fsi (4,0--5,15))],
-          PreXmlDocEmpty, [], None, /root/ValKeyword.fsi (2,0--5,15),
-          { LeadingKeyword = Namespace /root/ValKeyword.fsi (2,0--2,9) })],
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
deleted file mode 100644
index 7d1dc9d6b07..00000000000
--- a/tests/service/data/SyntaxTree/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
+++ /dev/null
@@ -1,16 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/VerbatimStringAsParsedHashDirectiveArgument.fs", false,
-      QualifiedNameOfFile VerbatimStringAsParsedHashDirectiveArgument, [], [],
-      [SynModuleOrNamespace
-         ([VerbatimStringAsParsedHashDirectiveArgument], false, AnonModule,
-          [HashDirective
-             (ParsedHashDirective
-                ("I", [],
-                 /root/VerbatimStringAsParsedHashDirectiveArgument.fs (2,0--2,2)),
-              /root/VerbatimStringAsParsedHashDirectiveArgument.fs (2,0--2,4))],
-          PreXmlDocEmpty, [], None,
-          /root/VerbatimStringAsParsedHashDirectiveArgument.fs (2,0--2,4),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_LINE_.fs.bsl b/tests/service/data/SyntaxTree/_LINE_.fs.bsl
deleted file mode 100644
index 2c7b5259c6a..00000000000
--- a/tests/service/data/SyntaxTree/_LINE_.fs.bsl
+++ /dev/null
@@ -1,13 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/_LINE_.fs", false, QualifiedNameOfFile _LINE_, [], [],
-      [SynModuleOrNamespace
-         ([_LINE_], false, AnonModule,
-          [Expr
-             (Const
-                (SourceIdentifier ("__LINE__", "2", /root/_LINE_.fs (2,0--2,8)),
-                 /root/_LINE_.fs (2,0--2,8)), /root/_LINE_.fs (2,0--2,8))],
-          PreXmlDocEmpty, [], None, /root/_LINE_.fs (2,0--2,8),
-          { LeadingKeyword = None })], (true, false),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl b/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl
deleted file mode 100644
index dda204d7b85..00000000000
--- a/tests/service/data/SyntaxTree/_SOURCEDIRECTORY_.fs.bsl
+++ /dev/null
@@ -1,16 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/_SOURCEDIRECTORY_.fs", false, QualifiedNameOfFile _SOURCEDIRECTORY_,
-      [], [],
-      [SynModuleOrNamespace
-         ([_SOURCEDIRECTORY_], false, AnonModule,
-          [Expr
-             (Const
-                (SourceIdentifier
-                   ("__SOURCE_DIRECTORY__", "C:\root",
-                    /root/_SOURCEDIRECTORY_.fs (2,0--2,20)),
-                 /root/_SOURCEDIRECTORY_.fs (2,0--2,20)),
-              /root/_SOURCEDIRECTORY_.fs (2,0--2,20))], PreXmlDocEmpty, [], None,
-          /root/_SOURCEDIRECTORY_.fs (2,0--2,20), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
diff --git a/tests/service/data/SyntaxTree/_SOURCEFILE_.fs.bsl b/tests/service/data/SyntaxTree/_SOURCEFILE_.fs.bsl
deleted file mode 100644
index f9b0ec65221..00000000000
--- a/tests/service/data/SyntaxTree/_SOURCEFILE_.fs.bsl
+++ /dev/null
@@ -1,15 +0,0 @@
-ImplFile
-  (ParsedImplFileInput
-     ("/root/_SOURCEFILE_.fs", false, QualifiedNameOfFile _SOURCEFILE_, [], [],
-      [SynModuleOrNamespace
-         ([_SOURCEFILE_], false, AnonModule,
-          [Expr
-             (Const
-                (SourceIdentifier
-                   ("__SOURCE_FILE__", "_SOURCEFILE_.fs",
-                    /root/_SOURCEFILE_.fs (2,0--2,15)),
-                 /root/_SOURCEFILE_.fs (2,0--2,15)),
-              /root/_SOURCEFILE_.fs (2,0--2,15))], PreXmlDocEmpty, [], None,
-          /root/_SOURCEFILE_.fs (2,0--2,15), { LeadingKeyword = None })],
-      (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file

From 6a5b1a4ff94b0e7145e670349f01a0f5d3e2f466 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Thu, 9 Feb 2023 12:01:16 +0100
Subject: [PATCH 6/8] Add ending newline to baseline files.

---
 tests/service/SyntaxTreeTests.fs                                | 2 +-
 tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl | 2 +-
 .../data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl   | 2 +-
 .../data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl | 2 +-
 .../Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl          | 2 +-
 .../ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl      | 2 +-
 .../Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl      | 2 +-
 .../data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl       | 2 +-
 ...etKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl | 2 +-
 ...eOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl | 2 +-
 ...ibuteShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl | 2 +-
 ...ldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl | 2 +-
 ...buteShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl | 2 +-
 ...angeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl | 2 +-
 ...OfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl | 2 +-
 ...RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl | 2 +-
 .../RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl   | 2 +-
 ...houldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl | 2 +-
 .../RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl     | 2 +-
 ...RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl | 2 +-
 .../RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl       | 2 +-
 ...EqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl | 2 +-
 ...EqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl | 2 +-
 .../Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl    | 2 +-
 ...geOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl | 2 +-
 ...qualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl | 2 +-
 ...geOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl | 2 +-
 ...eOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl | 2 +-
 ...houldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl | 2 +-
 .../Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl   | 2 +-
 .../data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl | 2 +-
 .../CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl   | 2 +-
 .../data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl   | 2 +-
 .../CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl     | 2 +-
 .../data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl       | 2 +-
 .../data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl      | 2 +-
 .../CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl        | 2 +-
 ...SlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl | 2 +-
 .../CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl    | 2 +-
 ...AndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl | 2 +-
 .../SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl | 2 +-
 .../DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl   | 2 +-
 ...nMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl | 2 +-
 .../DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl    | 2 +-
 ...InMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl | 2 +-
 .../SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl    | 2 +-
 .../ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl | 2 +-
 .../NestedIfEndifWithComplexExpressions.fs.bsl                  | 2 +-
 .../NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl    | 2 +-
 .../SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl    | 2 +-
 .../ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl | 2 +-
 .../data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl   | 2 +-
 .../ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl     | 2 +-
 .../SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl | 2 +-
 .../SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl     | 2 +-
 .../data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl | 2 +-
 ...ynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +-
 ...rdContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl | 2 +-
 .../data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl    | 2 +-
 ...rdContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl | 2 +-
 .../NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl     | 2 +-
 .../Expression/SynExprAnonRecdWithStructKeyword.fs.bsl          | 2 +-
 ...rAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl | 2 +-
 .../Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl   | 2 +-
 .../SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl | 2 +-
 .../Expression/SynExprDynamicDoesContainParentheses.fs.bsl      | 2 +-
 .../Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl | 2 +-
 .../SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl   | 2 +-
 .../SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl           | 2 +-
 .../SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl     | 2 +-
 ...TokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl | 2 +-
 ...tOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl | 2 +-
 ...ExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl | 2 +-
 .../SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl | 2 +-
 .../SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl          | 2 +-
 .../data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl      | 2 +-
 ...rdContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl | 2 +-
 .../SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl      | 2 +-
 .../SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl   | 2 +-
 ...nExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl | 2 +-
 .../SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl | 2 +-
 .../SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl     | 2 +-
 .../data/SyntaxTree/IfThenElse/CommentBetweenElseAndIf.fs.bsl   | 2 +-
 .../data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl    | 2 +-
 .../SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl  | 2 +-
 .../data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl     | 2 +-
 .../IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl       | 2 +-
 .../data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl    | 2 +-
 .../data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl  | 2 +-
 .../IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl     | 2 +-
 .../Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl           | 2 +-
 .../data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl | 2 +-
 .../LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl | 2 +-
 .../Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl       | 2 +-
 .../Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl   | 2 +-
 .../LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl | 2 +-
 .../data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl  | 2 +-
 .../data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl     | 2 +-
 .../data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl    | 2 +-
 .../data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl       | 2 +-
 .../data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl | 2 +-
 tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl  | 2 +-
 .../data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl       | 2 +-
 .../data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl     | 2 +-
 tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl   | 2 +-
 .../data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl       | 2 +-
 .../service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl | 2 +-
 tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl  | 2 +-
 .../service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl | 2 +-
 .../service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl | 2 +-
 .../data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl      | 2 +-
 tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl  | 2 +-
 .../data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl       | 2 +-
 .../data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl    | 2 +-
 .../data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl | 2 +-
 .../LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl           | 2 +-
 .../data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl      | 2 +-
 .../data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl   | 2 +-
 .../data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl   | 2 +-
 .../SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl     | 2 +-
 .../data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl     | 2 +-
 .../data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl      | 2 +-
 tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl  | 2 +-
 .../service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl | 2 +-
 tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl | 2 +-
 .../NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl  | 2 +-
 .../SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl  | 2 +-
 .../RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl           | 2 +-
 .../RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl | 2 +-
 .../RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl      | 2 +-
 .../RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl    | 2 +-
 .../RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl    | 2 +-
 .../SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl | 2 +-
 .../SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl   | 2 +-
 .../MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl | 2 +-
 .../RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl           | 2 +-
 ...RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl | 2 +-
 .../Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl         | 2 +-
 .../SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl    | 2 +-
 .../Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl    | 2 +-
 .../Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl       | 2 +-
 .../Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl   | 2 +-
 .../data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl | 2 +-
 .../data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl     | 2 +-
 .../data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl       | 2 +-
 ...InSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +-
 ...InSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +-
 .../data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl       | 2 +-
 .../data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl       | 2 +-
 .../data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl    | 2 +-
 ...eDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +-
 ...peDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl | 2 +-
 ...eDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +-
 .../Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl     | 2 +-
 .../SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl    | 2 +-
 .../Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl         | 2 +-
 ...InSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +-
 .../MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl      | 2 +-
 .../SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl           | 2 +-
 .../SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl           | 2 +-
 .../SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl       | 2 +-
 .../MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl     | 2 +-
 .../DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl  | 2 +-
 .../GlobalInOpenPathShouldContainTrivia.fs.bsl                  | 2 +-
 .../GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl         | 2 +-
 .../ModuleRangeShouldStartAtFirstAttribute.fs.bsl               | 2 +-
 .../ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl   | 2 +-
 ...spacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl | 2 +-
 .../NamespaceShouldContainNamespaceKeyword.fs.bsl               | 2 +-
 .../GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl        | 2 +-
 .../ModuleRangeShouldStartAtFirstAttribute.fsi.bsl              | 2 +-
 .../ModuleShouldContainModuleKeyword.fsi.bsl                    | 2 +-
 .../NamespaceShouldContainNamespaceKeyword.fsi.bsl              | 2 +-
 .../RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl    | 2 +-
 ...fAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl | 2 +-
 ...ributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl | 2 +-
 .../NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl         | 2 +-
 .../RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl        | 2 +-
 ...uleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl | 2 +-
 .../data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl | 2 +-
 .../data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl | 2 +-
 .../OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl  | 2 +-
 .../SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl     | 2 +-
 .../DetectDifferenceBetweenCompiledOperators.fs.bsl             | 2 +-
 .../service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl  | 2 +-
 .../service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl  | 2 +-
 .../service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl  | 2 +-
 .../SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl    | 2 +-
 .../data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl      | 2 +-
 .../SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl   | 2 +-
 .../SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl     | 2 +-
 .../SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl | 2 +-
 .../data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl      | 2 +-
 .../OperatorName/PartialActivePatternAsFunction.fs.bsl          | 2 +-
 .../OperatorName/PartialActivePatternDefinition.fs.bsl          | 2 +-
 .../PartialActivePatternDefinitionWithoutParameters.fs.bsl      | 2 +-
 .../service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl | 2 +-
 .../OperatorName/PrefixOperationWithTwoCharacters.fs.bsl        | 2 +-
 .../SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl  | 2 +-
 .../RegularStringAsParsedHashDirectiveArgument.fs.bsl           | 2 +-
 .../SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl        | 2 +-
 .../TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl       | 2 +-
 .../VerbatimStringAsParsedHashDirectiveArgument.fs.bsl          | 2 +-
 tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl      | 2 +-
 .../data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl       | 2 +-
 .../data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl    | 2 +-
 .../Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl          | 2 +-
 ...SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl | 2 +-
 .../SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl  | 2 +-
 .../Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl  | 2 +-
 .../SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl | 2 +-
 .../SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl  | 2 +-
 .../SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl        | 2 +-
 ...emberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl | 2 +-
 .../NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl             | 2 +-
 ...ldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl | 2 +-
 .../RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl    | 2 +-
 ...angeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl | 2 +-
 .../RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl   | 2 +-
 ...ncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl | 2 +-
 .../RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl  | 2 +-
 ...angeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl | 2 +-
 .../RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl    | 2 +-
 .../RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl       | 2 +-
 .../SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl      | 2 +-
 ...ynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl | 2 +-
 ...SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl | 2 +-
 ...ynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl | 2 +-
 ...gWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl | 2 +-
 ...thObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl | 2 +-
 ...nTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl | 2 +-
 .../SignatureType/SynValSigContainsParameterNames.fsi.bsl       | 2 +-
 .../SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl       | 2 +-
 .../SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl        | 2 +-
 tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl    | 2 +-
 .../data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl   | 2 +-
 .../data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl        | 2 +-
 .../String/SynConstBytesWithSynByteStringKindRegular.fs.bsl     | 2 +-
 .../String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl    | 2 +-
 .../String/SynConstStringWithSynStringKindRegular.fs.bsl        | 2 +-
 .../String/SynConstStringWithSynStringKindTripleQuote.fs.bsl    | 2 +-
 .../String/SynConstStringWithSynStringKindVerbatim.fs.bsl       | 2 +-
 .../SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl    | 2 +-
 ...SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl | 2 +-
 .../SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl   | 2 +-
 .../service/data/SyntaxTree/SynIdent/IncompleteLongIdent.fs.bsl | 2 +-
 .../SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl        | 2 +-
 .../SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl          | 2 +-
 .../SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl   | 2 +-
 ...TypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl | 2 +-
 .../SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl       | 2 +-
 .../SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl   | 2 +-
 .../SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl | 2 +-
 .../Type/AttributesInOptionalNamedMemberParameter.fs.bsl        | 2 +-
 .../Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl      | 2 +-
 .../data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl   | 2 +-
 .../Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl         | 2 +-
 .../Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl   | 2 +-
 .../RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl    | 2 +-
 .../Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl        | 2 +-
 ...ynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +-
 ...TypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl | 2 +-
 ...eDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +-
 .../SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl   | 2 +-
 ...fnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl | 2 +-
 ...ithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl | 2 +-
 ...SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl | 2 +-
 .../SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl  | 2 +-
 ...SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl | 2 +-
 .../data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl       | 2 +-
 .../service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl  | 2 +-
 .../data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl  | 2 +-
 .../UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl          | 2 +-
 .../data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl     | 2 +-
 .../SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl   | 2 +-
 .../SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl    | 2 +-
 .../data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl   | 2 +-
 .../SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl  | 2 +-
 tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl         | 2 +-
 279 files changed, 279 insertions(+), 279 deletions(-)

diff --git a/tests/service/SyntaxTreeTests.fs b/tests/service/SyntaxTreeTests.fs
index 6d4b7b17ee1..fa7e2342aff 100644
--- a/tests/service/SyntaxTreeTests.fs
+++ b/tests/service/SyntaxTreeTests.fs
@@ -48,7 +48,7 @@ let ParseFile fileName =
     let ast = parseSourceCode (fileName, contents)
 
     let normalize (s: string) = s.Replace("\r", "")
-    let actual = sprintf "%A" ast |> normalize
+    let actual = sprintf "%A" ast |> normalize |> sprintf "%s\n"
     let bslPath = $"{fullPath}.bsl"
 
     let expected =
diff --git a/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl b/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl
index b787cc3ebb1..eb73fdb1da6 100644
--- a/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl
+++ b/tests/service/data/SyntaxTree/Attribute/RangeOfAttribute.fs.bsl
@@ -43,4 +43,4 @@ ImplFile
           [], None, /root/Attribute/RangeOfAttribute.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl
index 016e21ba87d..21ced8decad 100644
--- a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl
+++ b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithPath.fs.bsl
@@ -51,4 +51,4 @@ ImplFile
           /root/Attribute/RangeOfAttributeWithPath.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl
index 81eb0ba685b..cb57f201b5d 100644
--- a/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl
+++ b/tests/service/data/SyntaxTree/Attribute/RangeOfAttributeWithTarget.fs.bsl
@@ -49,4 +49,4 @@ ImplFile
           /root/Attribute/RangeOfAttributeWithTarget.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
index 16e8f6c9402..efad6f4bc28 100644
--- a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
@@ -55,4 +55,4 @@ ImplFile
           /root/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
index d7082cab820..86744b0eb6d 100644
--- a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
@@ -153,4 +153,4 @@ ImplFile
           /root/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl
index 21e23eab7b7..9bb54c823c3 100644
--- a/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl
@@ -78,4 +78,4 @@ ImplFile
              /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (3,0--3,8));
           EndIf
             /root/Binding/ConditionalDirectiveAroundInlineKeyword.fs (5,0--5,6)]
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl
index 02b3c0a6638..d9bc891e4ec 100644
--- a/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl
@@ -80,4 +80,4 @@ ImplFile
           /root/Binding/InlineKeywordInBinding.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
index 6f097852bcd..440cc195a98 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
@@ -56,4 +56,4 @@ ImplFile
           /root/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
index 168e49152b0..1d3357fe6a3 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
@@ -85,4 +85,4 @@ ImplFile
           /root/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs (2,0--4,32),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
index 38a0279094b..ce4dbdcc6b7 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
@@ -81,4 +81,4 @@ ImplFile
           /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl
index abe8ef8a683..3c674445d76 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl
@@ -82,4 +82,4 @@ ImplFile
           /root/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
index 5eee29b9c02..3247696b81a 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
@@ -155,4 +155,4 @@ ImplFile
           /root/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
index 10ac678b3a4..8bfb347f1f6 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
@@ -187,4 +187,4 @@ ImplFile
           /root/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs (2,0--12,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
index 9ee10344c01..3d465a7b998 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
@@ -70,4 +70,4 @@ ImplFile
           /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
index 0ca71236280..c8e7af27f8c 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
@@ -84,4 +84,4 @@ ImplFile
           /root/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
index 5b7cb00c2d1..195a4910e6e 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
@@ -48,4 +48,4 @@ ImplFile
           /root/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
index 0d5d5fd4b64..ef731b1698b 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
@@ -100,4 +100,4 @@ ImplFile
           /root/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
index 85b532c7686..86cf0d110a5 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
@@ -43,4 +43,4 @@ ImplFile
           /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl
index dd08bad7bf9..5c4b8049db8 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl
@@ -55,4 +55,4 @@ ImplFile
           /root/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
index 18932f5495e..e79eb9e5c63 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
@@ -78,4 +78,4 @@ ImplFile
           /root/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl
index 16cdba5225c..6fd6d32c333 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl
@@ -88,4 +88,4 @@ ImplFile
           /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl
index 73c9d898932..d47328acfbe 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl
@@ -100,4 +100,4 @@ ImplFile
           /root/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
index 5d5026f2b76..1346c34a892 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
@@ -144,4 +144,4 @@ ImplFile
           /root/Binding/RangeOfEqualSignShouldBePresentInProperty.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
index 55b7c493005..9c94d13d1b4 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
@@ -36,4 +36,4 @@ ImplFile
           /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl
index d25f98d7be7..c079103ecbc 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl
@@ -46,4 +46,4 @@ ImplFile
           /root/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
index ee895f9e875..b2adae89a6f 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
@@ -65,4 +65,4 @@ ImplFile
           /root/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
index 00a22ca6a02..ab87b20b99d 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
@@ -36,4 +36,4 @@ ImplFile
           /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
index 52122cf9455..62d4037b5ab 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
@@ -52,4 +52,4 @@ ImplFile
         CodeComments =
          [LineComment
             /root/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs (4,0--4,15)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl b/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
index 781e72a288c..fc9f1e2d9ac 100644
--- a/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
@@ -128,4 +128,4 @@ ImplFile
           /root/Binding/TupleReturnTypeOfBindingShouldContainStars.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl
index c166d7d1174..9fba26d5db2 100644
--- a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl
@@ -55,4 +55,4 @@ ImplFile
       { ConditionalDirectives = []
         CodeComments =
          [BlockComment /root/CodeComment/BlockCommentInSourceCode.fs (2,6--2,13)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl
index a5b6412322e..78112c71c56 100644
--- a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi.bsl
@@ -28,4 +28,4 @@ SigFile
         CodeComments =
          [BlockComment
             /root/CodeComment/BlockCommentInSourceCodeSignatureFile.fsi (4,6--4,13)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl
index ceb82a64d3f..99510087c80 100644
--- a/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCode.fs.bsl
@@ -17,4 +17,4 @@ ImplFile
       { ConditionalDirectives = []
         CodeComments =
          [LineComment /root/CodeComment/CommentAfterSourceCode.fs (2,6--2,17)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl
index c1009f3370b..a7ac721d6cf 100644
--- a/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/CommentAfterSourceCodeSignatureFile.fsi.bsl
@@ -28,4 +28,4 @@ SigFile
         CodeComments =
          [LineComment
             /root/CodeComment/CommentAfterSourceCodeSignatureFile.fsi (4,14--4,25)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl
index 0975ee371ff..da00da85e1d 100644
--- a/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/CommentAtEndOfFile.fs.bsl
@@ -11,4 +11,4 @@ ImplFile
       { ConditionalDirectives = []
         CodeComments =
          [LineComment /root/CodeComment/CommentAtEndOfFile.fs (2,2--2,6)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl
index 676bc2adcff..def8065f0c9 100644
--- a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLine.fs.bsl
@@ -17,4 +17,4 @@ ImplFile
       { ConditionalDirectives = []
         CodeComments =
          [LineComment /root/CodeComment/CommentOnSingleLine.fs (2,0--2,11)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl
index 10e8b09c983..5e45782eb24 100644
--- a/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/CommentOnSingleLineSignatureFile.fsi.bsl
@@ -12,4 +12,4 @@ SigFile
         CodeComments =
          [LineComment
             /root/CodeComment/CommentOnSingleLineSignatureFile.fsi (3,0--3,11)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl
index 941d33f1387..67a3e659d19 100644
--- a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl
@@ -68,4 +68,4 @@ ImplFile
             /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (6,4--6,36);
           LineComment
             /root/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs (7,4--7,27)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl
index 8fe57e81916..cc6ea0705c3 100644
--- a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl
@@ -33,4 +33,4 @@ ImplFile
           /root/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs (3,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl
index 524600f6d8d..4d63b60dc47 100644
--- a/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl
+++ b/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl
@@ -76,4 +76,4 @@ ImplFile
           /root/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs (2,0--7,1),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl
index f35536a8fa5..340324dadc0 100644
--- a/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl
+++ b/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl
@@ -56,4 +56,4 @@ ImplFile
           /root/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs (2,0--8,1),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
index 8f6dfb42075..b454be43944 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
@@ -39,4 +39,4 @@ ImplFile
         CodeComments =
          [BlockComment
             /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs (3,0--7,2)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl
index fe842a3dcc9..45cce9e207a 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi.bsl
@@ -34,4 +34,4 @@ SigFile
         CodeComments =
          [BlockComment
             /root/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTriviaSignatureFile.fsi (5,0--9,2)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
index 87cfc9b08e2..02cde679d3c 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
@@ -35,4 +35,4 @@ ImplFile
           /root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs (2,0--8,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl
index 7bf08537a72..dd45208011f 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi.bsl
@@ -10,4 +10,4 @@ SigFile
              Namespace
                /root/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTriviaSignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl
index 99b38f9e781..85758d16378 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl
@@ -43,4 +43,4 @@ ImplFile
           EndIf /root/ConditionalDirective/NestedIfElseEndif.fs (8,8--8,14);
           Else /root/ConditionalDirective/NestedIfElseEndif.fs (9,4--9,9);
           EndIf /root/ConditionalDirective/NestedIfElseEndif.fs (11,4--11,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl
index 267aa3303de..74bbbb0dd05 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi.bsl
@@ -44,4 +44,4 @@ SigFile
             /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (11,4--11,9);
           EndIf
             /root/ConditionalDirective/NestedIfElseEndifSignatureFile.fsi (13,4--13,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl
index 8886afca195..ea25e690222 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl
@@ -48,4 +48,4 @@ ImplFile
             /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (8,8--8,14);
           EndIf
             /root/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs (9,4--9,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl
index 0ce4b9068a6..9cde00baa8c 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi.bsl
@@ -46,4 +46,4 @@ SigFile
             /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (10,8--10,14);
           EndIf
             /root/ConditionalDirective/NestedIfEndifWithComplexExpressionsSignatureFile.fsi (11,4--11,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl
index 8b693fdacbd..35ef62f645c 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl
@@ -37,4 +37,4 @@ ImplFile
              /root/ConditionalDirective/SingleIfElseEndif.fs (3,4--3,13));
           Else /root/ConditionalDirective/SingleIfElseEndif.fs (5,4--5,9);
           EndIf /root/ConditionalDirective/SingleIfElseEndif.fs (7,4--7,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl
index e474fe5a17f..2ee32d94859 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi.bsl
@@ -37,4 +37,4 @@ SigFile
             /root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi (7,4--7,9);
           EndIf
             /root/ConditionalDirective/SingleIfElseEndifSignatureFile.fsi (9,4--9,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl
index 40e277372bd..72f49f5c04e 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl
@@ -34,4 +34,4 @@ ImplFile
             (Ident "DEBUG",
              /root/ConditionalDirective/SingleIfEndif.fs (3,4--3,13));
           EndIf /root/ConditionalDirective/SingleIfEndif.fs (5,4--5,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl
index 36dcb5e7619..72d5c9759d8 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndifSignatureFile.fsi.bsl
@@ -35,4 +35,4 @@ SigFile
              /root/ConditionalDirective/SingleIfEndifSignatureFile.fsi (5,4--5,13));
           EndIf
             /root/ConditionalDirective/SingleIfEndifSignatureFile.fsi (7,4--7,10)]
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl b/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl
index d7b54132ac6..0a1c1397c08 100644
--- a/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/EnumCase/MultipleSynEnumCasesHaveBarRange.fs.bsl
@@ -53,4 +53,4 @@ ImplFile
           /root/EnumCase/MultipleSynEnumCasesHaveBarRange.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl
index 03263d25008..e58922da78b 100644
--- a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseHasBarRange.fs.bsl
@@ -41,4 +41,4 @@ ImplFile
           /root/EnumCase/SingleSynEnumCaseHasBarRange.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl
index fde5766870d..37a2491df21 100644
--- a/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl
+++ b/tests/service/data/SyntaxTree/EnumCase/SingleSynEnumCaseWithoutBar.fs.bsl
@@ -39,4 +39,4 @@ ImplFile
           /root/EnumCase/SingleSynEnumCaseWithoutBar.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
index fcea76520ae..25607fff6b4 100644
--- a/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -64,4 +64,4 @@ ImplFile
              Namespace
                /root/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs (2,0--2,9) })],
       (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
+                       CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
index 97f5ec6c25d..72bf10a74d0 100644
--- a/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
@@ -30,4 +30,4 @@ ImplFile
           /root/Expression/CopySynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--5,20),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl b/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl
index fe98d151baf..cfb161739e9 100644
--- a/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/GlobalKeywordAsSynExpr.fs.bsl
@@ -15,4 +15,4 @@ ImplFile
           /root/Expression/GlobalKeywordAsSynExpr.fs (2,0--2,6),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
index 2c0662ac35f..f385cae05ae 100644
--- a/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
@@ -41,4 +41,4 @@ ImplFile
           /root/Expression/InheritSynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (2,0--2,34),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
index 77bbcdb42ba..81edb0976c3 100644
--- a/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
@@ -114,4 +114,4 @@ ImplFile
         CodeComments =
          [LineComment
             /root/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs (3,17--3,55)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl
index 63477388d71..980b9bdf6f2 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecdWithStructKeyword.fs.bsl
@@ -25,4 +25,4 @@ ImplFile
         CodeComments =
          [LineComment
             /root/Expression/SynExprAnonRecdWithStructKeyword.fs (4,4--4,11)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
index ab0d9eb8667..ba1a356678f 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs.bsl
@@ -34,4 +34,4 @@ ImplFile
           /root/Expression/SynExprAnonRecordContainsTheRangeOfTheEqualsSignInTheFields.fs (2,0--4,18),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
index 79e064c3651..83374f1f442 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
@@ -38,4 +38,4 @@ ImplFile
           /root/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl
index 228c475a5bd..5d1b312e4a8 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainIdent.fs.bsl
@@ -15,4 +15,4 @@ ImplFile
           /root/Expression/SynExprDynamicDoesContainIdent.fs (2,0--2,3),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl
index 0203b86c81e..3bee2ce5682 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprDynamicDoesContainParentheses.fs.bsl
@@ -20,4 +20,4 @@ ImplFile
           /root/Expression/SynExprDynamicDoesContainParentheses.fs (2,0--2,5),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
index 0a934bba6f4..d8ea57b8318 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -38,4 +38,4 @@ ImplFile
           /root/Expression/SynExprForContainsTheRangeOfTheEqualsSign.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
index 0af7a738c7f..6e56e1bd396 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -54,4 +54,4 @@ ImplFile
           /root/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs (2,0--6,1),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
index 6285a4bc737..b644b1d0ae3 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
@@ -42,4 +42,4 @@ ImplFile
           /root/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs (2,0--2,15),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
index 75f83ca1682..bdb048b197d 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
@@ -44,4 +44,4 @@ ImplFile
           /root/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
index 2139338a1f4..2f783ad9bca 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
@@ -66,4 +66,4 @@ ImplFile
           /root/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
index 8a3838a7383..715bd06b761 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
@@ -71,4 +71,4 @@ ImplFile
           /root/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
index a43571c0236..4c55cbd2149 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
@@ -35,4 +35,4 @@ ImplFile
           /root/Expression/SynExprMatchBangContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
index 67766a838a7..fff742faaa5 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs.bsl
@@ -35,4 +35,4 @@ ImplFile
           /root/Expression/SynExprMatchContainsTheRangeOfTheMatchAndWithKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
index 620a36d52e0..e8521adb317 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
@@ -138,4 +138,4 @@ ImplFile
           /root/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs (2,0--6,37),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl
index 44b73797995..641a610e4cb 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl
@@ -155,4 +155,4 @@ ImplFile
           /root/Expression/SynExprObjWithSetter.fs (2,0--7,69),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
index 4e0ed8b11b2..5efcf861814 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs.bsl
@@ -45,4 +45,4 @@ ImplFile
         CodeComments =
          [LineComment
             /root/Expression/SynExprRecordContainsTheRangeOfTheEqualsSignInSynExprRecordField.fs (3,13--3,28)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
index 681f8296cf8..5113634fe8c 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs.bsl
@@ -76,4 +76,4 @@ ImplFile
           /root/Expression/SynExprRecordFieldsContainCorrectAmountOfTrivia.fs (2,0--5,28),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl
index 76c92c96b8a..04cabb14165 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprSetWithSynExprDynamic.fs.bsl
@@ -20,4 +20,4 @@ ImplFile
           /root/Expression/SynExprSetWithSynExprDynamic.fs (2,0--2,8),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
index 6b178749bef..010c0914890 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
@@ -27,4 +27,4 @@ ImplFile
           /root/Expression/SynExprTryFinallyContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
index e4d29975a85..fe6842c2c2a 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs.bsl
@@ -41,4 +41,4 @@ ImplFile
           /root/Expression/SynExprTryWithContainsTheRangeOfTheTryAndWithKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl b/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl
index a76c9aeb358..8b5766b3eae 100644
--- a/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl
@@ -59,4 +59,4 @@ ImplFile
           /root/Extern/ExternKeywordIsPresentInTrivia.fs (2,0--2,28),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/IfThenElse/CommentBetweenElseAndIf.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/CommentBetweenElseAndIf.fs.bsl
index 454213baa16..28b6f59451e 100644
--- a/tests/service/data/SyntaxTree/IfThenElse/CommentBetweenElseAndIf.fs.bsl
+++ b/tests/service/data/SyntaxTree/IfThenElse/CommentBetweenElseAndIf.fs.bsl
@@ -40,4 +40,4 @@ ImplFile
       { ConditionalDirectives = []
         CodeComments =
          [BlockComment /root/IfThenElse/CommentBetweenElseAndIf.fs (4,5--4,33)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl
index 089313be12b..d9dd0a3dd4a 100644
--- a/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl
+++ b/tests/service/data/SyntaxTree/IfThenElse/DeeplyNestedIfThenElse.fs.bsl
@@ -56,4 +56,4 @@ ImplFile
           /root/IfThenElse/DeeplyNestedIfThenElse.fs (2,0--11,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl
index d190a837106..6711c41678c 100644
--- a/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl
+++ b/tests/service/data/SyntaxTree/IfThenElse/ElseKeywordInSimpleIfThenElse.fs.bsl
@@ -26,4 +26,4 @@ ImplFile
           /root/IfThenElse/ElseKeywordInSimpleIfThenElse.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl
index 4c2244adb4b..c3f5d622334 100644
--- a/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl
+++ b/tests/service/data/SyntaxTree/IfThenElse/IfKeywordInIfThenElse.fs.bsl
@@ -22,4 +22,4 @@ ImplFile
           /root/IfThenElse/IfKeywordInIfThenElse.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl
index eeae62f9df4..1000eb53ca1 100644
--- a/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl
+++ b/tests/service/data/SyntaxTree/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs.bsl
@@ -26,4 +26,4 @@ ImplFile
           /root/IfThenElse/IfThenAndElseKeywordOnSeparateLines.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl
index 98023d761f5..50f27031deb 100644
--- a/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl
+++ b/tests/service/data/SyntaxTree/IfThenElse/NestedElifInIfThenElse.fs.bsl
@@ -37,4 +37,4 @@ ImplFile
           /root/IfThenElse/NestedElifInIfThenElse.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl
index 0e7655c5156..dec1198d4ea 100644
--- a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl
+++ b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfInIfThenElse.fs.bsl
@@ -38,4 +38,4 @@ ImplFile
           /root/IfThenElse/NestedElseIfInIfThenElse.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
index 378d5f24b3e..301f95221ae 100644
--- a/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
+++ b/tests/service/data/SyntaxTree/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs.bsl
@@ -41,4 +41,4 @@ ImplFile
           /root/IfThenElse/NestedElseIfOnTheSameLineInIfThenElse.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl
index cea7f8be3ed..78e8d52e045 100644
--- a/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/Lambda/ComplexArgumentsLambdaHasArrowRange.fs.bsl
@@ -241,4 +241,4 @@ ImplFile
           /root/Lambda/ComplexArgumentsLambdaHasArrowRange.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl
index b42322e4136..774fcfe5189 100644
--- a/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/Lambda/DestructedLambdaHasArrowRange.fs.bsl
@@ -99,4 +99,4 @@ ImplFile
           /root/Lambda/DestructedLambdaHasArrowRange.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
index 50fd6d0cc22..438e45ecc9d 100644
--- a/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
+++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs.bsl
@@ -69,4 +69,4 @@ ImplFile
           /root/Lambda/LambdaWithTupleParameterWithWildCardGivesCorrectBody.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
index be48a4506b2..48e43ee677c 100644
--- a/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
+++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs.bsl
@@ -41,4 +41,4 @@ ImplFile
           /root/Lambda/LambdaWithTwoParametersGivesCorrectBody.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
index 69d5e128a19..c074d9d4315 100644
--- a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
+++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs.bsl
@@ -55,4 +55,4 @@ ImplFile
           /root/Lambda/LambdaWithWildCardParameterGivesCorrectBody.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
index 2f0ac32a468..155791b2382 100644
--- a/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
+++ b/tests/service/data/SyntaxTree/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs.bsl
@@ -59,4 +59,4 @@ ImplFile
           /root/Lambda/LambdaWithWildCardThatReturnsALambdaGivesCorrectBody.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl
index 7b615564c46..d8042dd6a86 100644
--- a/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/Lambda/MultilineLambdaHasArrowRange.fs.bsl
@@ -109,4 +109,4 @@ ImplFile
           /root/Lambda/MultilineLambdaHasArrowRange.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl
index 150c0a48a50..5b40dec3ad2 100644
--- a/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/Lambda/SimpleLambdaHasArrowRange.fs.bsl
@@ -26,4 +26,4 @@ ImplFile
           /root/Lambda/SimpleLambdaHasArrowRange.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl b/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl
index 891e407f618..f7a18c3466e 100644
--- a/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/Lambda/TupleInLambdaHasArrowRange.fs.bsl
@@ -66,4 +66,4 @@ ImplFile
           /root/Lambda/TupleInLambdaHasArrowRange.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl
index 638d06e413e..80a0d86f80a 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractKeyword.fs.bsl
@@ -49,4 +49,4 @@ ImplFile
           /root/LeadingKeyword/AbstractKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl
index 6381235b8e8..889c6c9a68a 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/AbstractMemberKeyword.fs.bsl
@@ -53,4 +53,4 @@ ImplFile
           /root/LeadingKeyword/AbstractMemberKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl
index 1f69663b4dc..75d4ad41ea4 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl
@@ -80,4 +80,4 @@ ImplFile
           [], None, /root/LeadingKeyword/AndKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl
index 1ec8bc239b1..af29702be01 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultKeyword.fsi.bsl
@@ -50,4 +50,4 @@ SigFile
           { LeadingKeyword =
              Namespace /root/LeadingKeyword/DefaultKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl
index 36c79fb7c7e..8c33ad5ca41 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/DefaultValKeyword.fs.bsl
@@ -55,4 +55,4 @@ ImplFile
           /root/LeadingKeyword/DefaultValKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl
index 2c8524528c2..b94cdf452de 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl
@@ -44,4 +44,4 @@ ImplFile
           None, /root/LeadingKeyword/DoKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl
index 829b59aa1b4..d126c115261 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl
@@ -48,4 +48,4 @@ ImplFile
           /root/LeadingKeyword/DoStaticKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl
index b4c7288b12c..bd147849b80 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl
@@ -57,4 +57,4 @@ ImplFile
           /root/LeadingKeyword/ExternKeyword.fs (2,0--2,17),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl
index 1fe3eada239..c2238b54871 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl
@@ -44,4 +44,4 @@ ImplFile
           [], None, /root/LeadingKeyword/LetKeyword.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl
index 0d86ce582b3..5fe88045ea8 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl
@@ -51,4 +51,4 @@ ImplFile
           /root/LeadingKeyword/LetRecKeyword.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl
index 0edebe00092..6299a61343b 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl
@@ -66,4 +66,4 @@ ImplFile
           /root/LeadingKeyword/MemberKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl
index f5f8fac1278..c95a8bb446e 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/MemberValKeyword.fs.bsl
@@ -55,4 +55,4 @@ ImplFile
           /root/LeadingKeyword/MemberValKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl
index 91300769c73..a2eafa984b5 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl
@@ -85,4 +85,4 @@ ImplFile
           [], None, /root/LeadingKeyword/NewKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl
index 4669991701a..82cce9a9d53 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl
@@ -70,4 +70,4 @@ ImplFile
           /root/LeadingKeyword/OverrideKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl
index ec27cc01484..8b2b06d9978 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideValKeyword.fs.bsl
@@ -55,4 +55,4 @@ ImplFile
           /root/LeadingKeyword/OverrideValKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl
index f6cd5aeaff7..c340e7daf15 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractKeyword.fs.bsl
@@ -59,4 +59,4 @@ ImplFile
           /root/LeadingKeyword/StaticAbstractKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl
index d3380a08e1d..f5ac2e68d91 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticAbstractMemberKeyword.fs.bsl
@@ -60,4 +60,4 @@ ImplFile
           /root/LeadingKeyword/StaticAbstractMemberKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl
index 44bdc10800c..fad85a380b9 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl
@@ -54,4 +54,4 @@ ImplFile
           /root/LeadingKeyword/StaticLetKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl
index 772abe800bb..f8a8bd2aacc 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl
@@ -64,4 +64,4 @@ ImplFile
           /root/LeadingKeyword/StaticLetRecKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl
index 1e12566001b..3890539054d 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl
@@ -68,4 +68,4 @@ ImplFile
           /root/LeadingKeyword/StaticMemberKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl
index 1b0025e0744..38543edeec8 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberValKeyword.fs.bsl
@@ -59,4 +59,4 @@ ImplFile
           /root/LeadingKeyword/StaticMemberValKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl
index 1b1d104558d..3eccaa6257d 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticValKeyword.fsi.bsl
@@ -45,4 +45,4 @@ SigFile
           { LeadingKeyword =
              Namespace /root/LeadingKeyword/StaticValKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl
index 7df01917f69..613a3a495bf 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl
@@ -33,4 +33,4 @@ ImplFile
           /root/LeadingKeyword/SyntheticKeyword.fs (2,0--3,12),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl
index 1310e27d9b3..86f7cf4fef4 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl
@@ -38,4 +38,4 @@ ImplFile
           [], None, /root/LeadingKeyword/UseKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl
index 49eb0e34739..06ea547ec81 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl
@@ -43,4 +43,4 @@ ImplFile
           [], None, /root/LeadingKeyword/UseRecKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl
index 7e777bfc331..85cc78b8761 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/ValKeyword.fsi.bsl
@@ -36,4 +36,4 @@ SigFile
           { LeadingKeyword =
              Namespace /root/LeadingKeyword/ValKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
index 493dd97cc5c..949a16881ff 100644
--- a/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
@@ -50,4 +50,4 @@ ImplFile
         CodeComments =
          [LineComment
             /root/MatchClause/NoRangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (5,4--5,19)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl
index 896e14e20d0..6af5f51d5cb 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClause.fs.bsl
@@ -40,4 +40,4 @@ ImplFile
           /root/MatchClause/RangeOfArrowInSynMatchClause.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
index fe53e78de0a..818f50a6ce2 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs.bsl
@@ -48,4 +48,4 @@ ImplFile
           /root/MatchClause/RangeOfArrowInSynMatchClauseWithWhenClause.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
index bc4084ac3bc..d372745cdc5 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs.bsl
@@ -74,4 +74,4 @@ ImplFile
         CodeComments =
          [LineComment
             /root/MatchClause/RangeOfBarInAMultipleSynMatchClausesInSynExprTryWith.fs (6,4--6,19)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
index 784c4bb1bec..6c9e307049c 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs.bsl
@@ -49,4 +49,4 @@ ImplFile
           /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprMatch.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
index 2bf70a9cc19..8397631e873 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs.bsl
@@ -48,4 +48,4 @@ ImplFile
           /root/MatchClause/RangeOfBarInASingleSynMatchClauseInSynExprTryWith.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
index 05e5c6722ed..c74fda4a087 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs.bsl
@@ -74,4 +74,4 @@ ImplFile
           /root/MatchClause/RangeOfBarInMultipleSynMatchClausesInSynExprMatch.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl
index a06a32b7982..2df35a41fde 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl
@@ -95,4 +95,4 @@ ImplFile
           /root/MatchClause/RangeOfMultipleSynMatchClause.fs (2,0--11,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl
index 0a09fe7ca1f..48997e79698 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl
@@ -78,4 +78,4 @@ ImplFile
           /root/MatchClause/RangeOfSingleSynMatchClause.fs (2,0--8,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
index 0e400c90f8a..0a36e08ecf5 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
@@ -70,4 +70,4 @@ ImplFile
           /root/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs (2,0--9,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
index 86332e0bc0c..eb85286e3c4 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs.bsl
@@ -68,4 +68,4 @@ ImplFile
           /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBody.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
index d6d77fd9a73..5f360110379 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs.bsl
@@ -79,4 +79,4 @@ ImplFile
           /root/MatchClause/RangeOfSingleSynMatchClauseWithMissingBodyAndWhenExpr.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl b/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl
index d9b15907e0b..1304f00c6a6 100644
--- a/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl
+++ b/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl
@@ -72,4 +72,4 @@ ImplFile
           /root/Measure/MeasureContainsTheRangeOfTheConstant.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl
index 3952df55d63..2fea5fd31c5 100644
--- a/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/Measure/SynMeasureParenHasCorrectRange.fs.bsl
@@ -34,4 +34,4 @@ ImplFile
           /root/Measure/SynMeasureParenHasCorrectRange.fs (2,0--2,23),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
index 94a5fff4d21..7c29306d461 100644
--- a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
+++ b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs.bsl
@@ -49,4 +49,4 @@ ImplFile
           /root/Measure/SynTypeTupleInMeasureTypeWithLeadingSlash.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
index 5fefb612dae..e950520b107 100644
--- a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
+++ b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs.bsl
@@ -49,4 +49,4 @@ ImplFile
           /root/Measure/SynTypeTupleInMeasureTypeWithNoSlashes.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
index eac0360fe37..258f33298bb 100644
--- a/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
+++ b/tests/service/data/SyntaxTree/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs.bsl
@@ -52,4 +52,4 @@ ImplFile
           /root/Measure/SynTypeTupleInMeasureTypeWithStartAndSlash.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl
index 6107aa6e2fe..9662ed0caa2 100644
--- a/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl
@@ -131,4 +131,4 @@ ImplFile
           /root/Member/GetSetMemberWithInlineKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl
index 163b39e3c0e..1fba2babf6d 100644
--- a/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/ImplicitCtorWithAsKeyword.fs.bsl
@@ -102,4 +102,4 @@ ImplFile
           LineComment /root/Member/ImplicitCtorWithAsKeyword.fs (5,0--5,7);
           LineComment /root/Member/ImplicitCtorWithAsKeyword.fs (6,0--6,8);
           LineComment /root/Member/ImplicitCtorWithAsKeyword.fs (7,0--7,9)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl
index f5f76ca871c..79e8180bc6e 100644
--- a/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl
@@ -68,4 +68,4 @@ ImplFile
           /root/Member/MemberWithInlineKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
index e1d4a0e5bfa..f31a00961d2 100644
--- a/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -104,4 +104,4 @@ ImplFile
         CodeComments =
          [LineComment
             /root/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,28)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
index 5e032ba16ae..f2a23c60aa8 100644
--- a/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -151,4 +151,4 @@ ImplFile
         CodeComments =
          [LineComment
             /root/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,29)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl b/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl
index eacde96eebe..2f830378a7e 100644
--- a/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl
+++ b/tests/service/data/SyntaxTree/Member/SignatureMemberWithGet.fsi.bsl
@@ -56,4 +56,4 @@ SigFile
       { ConditionalDirectives = []
         CodeComments =
          [LineComment /root/Member/SignatureMemberWithGet.fsi (5,4--5,23)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl
index dc42a0ff120..e3ce179860d 100644
--- a/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl
+++ b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSet.fsi.bsl
@@ -56,4 +56,4 @@ SigFile
       { ConditionalDirectives = []
         CodeComments =
          [LineComment /root/Member/SignatureMemberWithSet.fsi (5,4--5,23)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl
index 2f829329a3f..c206b141a84 100644
--- a/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl
+++ b/tests/service/data/SyntaxTree/Member/SignatureMemberWithSetget.fsi.bsl
@@ -58,4 +58,4 @@ SigFile
       { ConditionalDirectives = []
         CodeComments =
          [LineComment /root/Member/SignatureMemberWithSetget.fsi (5,4--5,23)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
index f06287b51ba..b0171012d11 100644
--- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -81,4 +81,4 @@ ImplFile
           /root/Member/SynTypeDefnWithAbstractSlotContainsTheRangeOfTheWithKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
index 3023dd873d4..865c851037b 100644
--- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -104,4 +104,4 @@ ImplFile
           /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheEqualsSign.fs (3,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
index a88ef04cc78..4750516379a 100644
--- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -108,4 +108,4 @@ ImplFile
           /root/Member/SynTypeDefnWithAutoPropertyContainsTheRangeOfTheWithKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
index bf0a38d0a1a..5d2b901a8c7 100644
--- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
@@ -81,4 +81,4 @@ ImplFile
           /root/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl
index 0adca5ba7bc..0732b13d059 100644
--- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl
@@ -171,4 +171,4 @@ ImplFile
           /root/Member/SynTypeDefnWithMemberWithSetget.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
index 5fbca71f9c4..f48ba78e8ae 100644
--- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
@@ -159,4 +159,4 @@ ImplFile
           /root/Member/SynTypeDefnWithStaticMemberWithGetset.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
index ed3d3888635..83fe5668b57 100644
--- a/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -109,4 +109,4 @@ ImplFile
         CodeComments =
          [LineComment
             /root/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs (3,4--3,29)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl
index 575f25268e0..e48691c47c5 100644
--- a/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl
+++ b/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl
@@ -167,4 +167,4 @@ ImplFile
           /root/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs (2,0--8,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
index 04e5b2ca480..4a750a9ce16 100644
--- a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs.bsl
@@ -77,4 +77,4 @@ ImplFile
           /root/MemberFlag/SynMemberDefnAbstractSlotHasCorrectKeyword.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
index 3a0f4dd2001..50dc8285112 100644
--- a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs.bsl
@@ -149,4 +149,4 @@ ImplFile
           /root/MemberFlag/SynMemberDefnAutoPropertyHasCorrectKeyword.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
index c181ddd1a30..7354c02587a 100644
--- a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
@@ -193,4 +193,4 @@ ImplFile
           /root/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs (2,0--7,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
index 90c4da77167..801928e3fa0 100644
--- a/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
+++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi.bsl
@@ -176,4 +176,4 @@ SigFile
              Namespace
                /root/MemberFlag/SynMemberSigMemberHasCorrectKeywords.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
index ba92f1e3181..c35b870c6f4 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs.bsl
@@ -37,4 +37,4 @@ ImplFile
              Namespace
                /root/ModuleOrNamespace/DeclaredNamespaceRangeShouldStartAtNamespaceKeyword.fs (2,0--2,9) })],
       (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
+                       CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl
index 77e4fd6ca96..f2b8bbab926 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs.bsl
@@ -18,4 +18,4 @@ ImplFile
              Namespace
                /root/ModuleOrNamespace/GlobalInOpenPathShouldContainTrivia.fs (2,0--2,9) })],
       (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
+                       CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
index 93d2ed615d3..7faf4d9c294 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs.bsl
@@ -39,4 +39,4 @@ ImplFile
             /root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (2,0--2,6);
           LineComment
             /root/ModuleOrNamespace/GlobalNamespaceShouldStartAtNamespaceKeyword.fs (3,0--3,6)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
index b49cc576c2d..aa19cf32b1a 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs.bsl
@@ -60,4 +60,4 @@ ImplFile
              Module
                /root/ModuleOrNamespace/ModuleRangeShouldStartAtFirstAttribute.fs (3,0--3,6) })],
       (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
+                       CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl
index a5e2eabe321..6e4d71ec28f 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl
@@ -88,4 +88,4 @@ ImplFile
              Module
                /root/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs (5,0--5,6) })],
       (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
+                       CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
index 7d55f48443b..14697d84763 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
@@ -65,4 +65,4 @@ ImplFile
              Namespace
                /root/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs (7,0--7,9) })],
       (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
+                       CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl
index d75315182aa..2b91e1acf5f 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl
@@ -51,4 +51,4 @@ ImplFile
              Namespace
                /root/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs (2,0--2,9) })],
       (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
+                       CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
index 4e375ab34f8..cb1ba47ffc4 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi.bsl
@@ -62,4 +62,4 @@ SigFile
             /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (2,0--2,6);
           LineComment
             /root/ModuleOrNamespaceSig/GlobalNamespaceShouldStartAtNamespaceKeyword.fsi (3,0--3,6)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
index 0c3a5a471e9..e7168ba6cf4 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi.bsl
@@ -38,4 +38,4 @@ SigFile
              Module
                /root/ModuleOrNamespaceSig/ModuleRangeShouldStartAtFirstAttribute.fsi (3,0--3,6) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl
index b7d19858833..92ba3d86626 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi.bsl
@@ -25,4 +25,4 @@ SigFile
              Module
                /root/ModuleOrNamespaceSig/ModuleShouldContainModuleKeyword.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi.bsl
index 8bd922ef96d..7c448a97484 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi.bsl
@@ -39,4 +39,4 @@ SigFile
              Namespace
                /root/ModuleOrNamespaceSig/NamespaceShouldContainNamespaceKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
index 2b4a9952f78..896bed51cce 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi.bsl
@@ -58,4 +58,4 @@ SigFile
              Namespace
                /root/ModuleOrNamespaceSig/RangeMemberReturnsRangeOfSynModuleOrNamespaceSig.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
index 57aa8bce3bd..5651ffb5b1d 100644
--- a/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
+++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs.bsl
@@ -42,4 +42,4 @@ ImplFile
              Module
                /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleDeclNestedModule.fs (2,0--2,6) })],
       (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
+                       CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
index fbb0c9ac6ee..4537f778663 100644
--- a/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
+++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi.bsl
@@ -52,4 +52,4 @@ SigFile
              Namespace
                /root/NestedModule/RangeOfAttributeShouldBeIncludedInSynModuleSigDeclNestedModule.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl
index 5ac48ded3ce..8d9d6cb837d 100644
--- a/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl
+++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresent.fs.bsl
@@ -28,4 +28,4 @@ ImplFile
           /root/NestedModule/RangeOfEqualSignShouldBePresent.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl
index 52532608b3b..fc86d73eefa 100644
--- a/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl
+++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi.bsl
@@ -39,4 +39,4 @@ SigFile
              Namespace
                /root/NestedModule/RangeOfEqualSignShouldBePresentSignatureFile.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl b/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
index 5336774862a..22976adbe9c 100644
--- a/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
+++ b/tests/service/data/SyntaxTree/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi.bsl
@@ -754,4 +754,4 @@ SigFile
             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (57,8--57,88);
           LineComment
             /root/NestedModule/RangeOfNestedModuleInSignatureFileShouldEndAtTheLastSynModuleSigDecl.fsi (60,8--60,89)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl
index 02c56e156cd..cc0f7837fa6 100644
--- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternAsFunction.fs.bsl
@@ -26,4 +26,4 @@ ImplFile
           /root/OperatorName/ActivePatternAsFunction.fs (2,0--2,14),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl
index 2d277ecb6ab..9f41eb5267d 100644
--- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl
@@ -95,4 +95,4 @@ ImplFile
           /root/OperatorName/ActivePatternDefinition.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl
index 7772e0000b0..2220af078cf 100644
--- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl
@@ -96,4 +96,4 @@ ImplFile
           /root/OperatorName/ActivePatternIdentifierInPrivateMember.fs (2,0--8,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl
index c5559f76147..dd2dacf365d 100644
--- a/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl
@@ -62,4 +62,4 @@ ImplFile
           /root/OperatorName/CustomOperatorDefinition.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl
index 47f33039bf1..37c03f3aa34 100644
--- a/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/DetectDifferenceBetweenCompiledOperators.fs.bsl
@@ -38,4 +38,4 @@ ImplFile
           /root/OperatorName/DetectDifferenceBetweenCompiledOperators.fs (2,0--3,15),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl
index cb4578ae268..18827c80974 100644
--- a/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/InfixOperation.fs.bsl
@@ -24,4 +24,4 @@ ImplFile
           [], None, /root/OperatorName/InfixOperation.fs (2,0--2,5),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl
index ed1a96e72bd..087d1832ca8 100644
--- a/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/NamedParameter.fs.bsl
@@ -32,4 +32,4 @@ ImplFile
           [], None, /root/OperatorName/NamedParameter.fs (2,0--2,6),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl
index 45ccdb12a8c..08fa4198c46 100644
--- a/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/NameofOperator.fs.bsl
@@ -22,4 +22,4 @@ ImplFile
           [], None, /root/OperatorName/NameofOperator.fs (2,0--2,9),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl
index 144e0af8187..9c88ef44236 100644
--- a/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl
@@ -169,4 +169,4 @@ ImplFile
           /root/OperatorName/ObjectModelWithTwoMembers.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl
index aa3011f62b2..cb3dea9b019 100644
--- a/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/OperatorAsFunction.fs.bsl
@@ -31,4 +31,4 @@ ImplFile
           /root/OperatorName/OperatorAsFunction.fs (2,0--2,7),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl
index 2d770aede1b..235258d2d36 100644
--- a/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl
@@ -89,4 +89,4 @@ ImplFile
           /root/OperatorName/OperatorInMemberDefinition.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl
index 4b42fe47a04..995f2bf1908 100644
--- a/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInSynValSig.fsi.bsl
@@ -51,4 +51,4 @@ SigFile
           { LeadingKeyword =
              Module /root/OperatorName/OperatorNameInSynValSig.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl
index c5a896978cd..8709d2513bc 100644
--- a/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/OperatorNameInValConstraint.fsi.bsl
@@ -114,4 +114,4 @@ SigFile
              Module
                /root/OperatorName/OperatorNameInValConstraint.fsi (3,4--3,10) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl
index ba569c77281..067a7f499c2 100644
--- a/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/OptionalExpression.fs.bsl
@@ -35,4 +35,4 @@ ImplFile
           /root/OperatorName/OptionalExpression.fs (2,0--2,9),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl
index a595de36632..8d7ba24c871 100644
--- a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternAsFunction.fs.bsl
@@ -26,4 +26,4 @@ ImplFile
           /root/OperatorName/PartialActivePatternAsFunction.fs (2,0--2,11),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl
index 3cd5076f730..a0b283d34bc 100644
--- a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl
@@ -90,4 +90,4 @@ ImplFile
           /root/OperatorName/PartialActivePatternDefinition.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl
index 0667cbcde19..1198be40033 100644
--- a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl
@@ -44,4 +44,4 @@ ImplFile
           /root/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl
index a471d0c9c83..b377190a451 100644
--- a/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/PrefixOperation.fs.bsl
@@ -19,4 +19,4 @@ ImplFile
           [], None, /root/OperatorName/PrefixOperation.fs (2,0--2,5),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl
index 4c877b7e451..788fec331f1 100644
--- a/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/PrefixOperationWithTwoCharacters.fs.bsl
@@ -20,4 +20,4 @@ ImplFile
           /root/OperatorName/PrefixOperationWithTwoCharacters.fs (2,0--2,5),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl
index 03a6d61d4e3..e09b00c6b6b 100644
--- a/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl
@@ -63,4 +63,4 @@ ImplFile
           /root/OperatorName/QualifiedOperatorExpression.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl
index ea32301845a..359c263b617 100644
--- a/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl
+++ b/tests/service/data/SyntaxTree/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs.bsl
@@ -14,4 +14,4 @@ ImplFile
           /root/ParsedHashDirective/RegularStringAsParsedHashDirectiveArgument.fs (2,0--2,4),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
index 7d08832f117..92e955b4c84 100644
--- a/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
+++ b/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
@@ -17,4 +17,4 @@ ImplFile
           /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
index ebdfc1568e7..c87b69675dc 100644
--- a/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
+++ b/tests/service/data/SyntaxTree/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs.bsl
@@ -14,4 +14,4 @@ ImplFile
           /root/ParsedHashDirective/TripleQuoteStringAsParsedHashDirectiveArgument.fs (2,0--2,9),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
index 800ebd9091f..ac4513c4650 100644
--- a/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
+++ b/tests/service/data/SyntaxTree/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs.bsl
@@ -14,4 +14,4 @@ ImplFile
           /root/ParsedHashDirective/VerbatimStringAsParsedHashDirectiveArgument.fs (2,0--2,4),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl b/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl
index 97081903f24..1cdec837f5e 100644
--- a/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl
+++ b/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl
@@ -45,4 +45,4 @@ ImplFile
           None, /root/Pattern/InHeadPattern.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl b/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl
index 7d37c5ab90c..847ea9c8b18 100644
--- a/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl
+++ b/tests/service/data/SyntaxTree/Pattern/OperatorInMatchPattern.fs.bsl
@@ -43,4 +43,4 @@ ImplFile
           /root/Pattern/OperatorInMatchPattern.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl b/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl
index 72443700ca5..124cdd87e6c 100644
--- a/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl
+++ b/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl
@@ -55,4 +55,4 @@ ImplFile
           /root/Pattern/OperatorInSynPatLongIdent.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl b/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
index 5dbb209f87f..8b948a55da4 100644
--- a/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
+++ b/tests/service/data/SyntaxTree/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs.bsl
@@ -67,4 +67,4 @@ ImplFile
             /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (3,15--3,21);
           BlockComment
             /root/Pattern/ParenthesesOfSynArgPatsNamePatPairs.fs (5,2--5,11)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
index 4e6429ae801..619b6c2283f 100644
--- a/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -45,4 +45,4 @@ ImplFile
           /root/Pattern/SynArgPatsNamePatPairsContainsTheRangeOfTheEqualsSign.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl b/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl
index e4be32a4323..dd5680da027 100644
--- a/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl
+++ b/tests/service/data/SyntaxTree/Pattern/SynPatOrContainsTheRangeOfTheBar.fs.bsl
@@ -59,4 +59,4 @@ ImplFile
           /root/Pattern/SynPatOrContainsTheRangeOfTheBar.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
index c67b57a91b9..dfff8f8f6ee 100644
--- a/tests/service/data/SyntaxTree/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -54,4 +54,4 @@ ImplFile
           /root/Pattern/SynPatRecordContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
index ddc31b1d579..d69f029570d 100644
--- a/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi.bsl
@@ -60,4 +60,4 @@ SigFile
              Module
                /root/SignatureType/EqualsTokenIsPresentInSynValSigMember.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
index 59522df7fff..a9faf0ca66f 100644
--- a/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi.bsl
@@ -30,4 +30,4 @@ SigFile
              Module
                /root/SignatureType/EqualsTokenIsPresentInSynValSigValue.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl
index 7e915bc20d8..84297954859 100644
--- a/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/LeadingKeywordInRecursiveTypes.fsi.bsl
@@ -49,4 +49,4 @@ SigFile
           PreXmlDocEmpty, [], None,
           /root/SignatureType/LeadingKeywordInRecursiveTypes.fsi (2,0--4,0),
           { LeadingKeyword = None })], { ConditionalDirectives = []
-                                         CodeComments = [] }, set []))
\ No newline at end of file
+                                         CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
index e4ee287f0ad..1fc26c2310a 100644
--- a/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
@@ -63,4 +63,4 @@ SigFile
              Namespace
                /root/SignatureType/MemberSigOfSynMemberSigMemberShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
index 9e69d6c8bc8..b8d471667d8 100644
--- a/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi.bsl
@@ -48,4 +48,4 @@ SigFile
           PreXmlDocEmpty, [], None,
           /root/SignatureType/NestedTypeHasStaticTypeAsLeadingKeyword.fsi (2,0--6,0),
           { LeadingKeyword = None })], { ConditionalDirectives = []
-                                         CodeComments = [] }, set []))
\ No newline at end of file
+                                         CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
index 6424dfe8b09..3895199dad2 100644
--- a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi.bsl
@@ -65,4 +65,4 @@ SigFile
         CodeComments =
          [LineComment
             /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynExceptionDefnReprAndSynExceptionSig.fsi (4,0--4,90)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
index ffd9785fdea..e3fd046a473 100644
--- a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi.bsl
@@ -43,4 +43,4 @@ SigFile
              Namespace
                /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynTypeDefnSig.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
index fc469fbc0aa..37353a891b4 100644
--- a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi.bsl
@@ -69,4 +69,4 @@ SigFile
         CodeComments =
          [LineComment
             /root/SignatureType/RangeOfAttributeShouldBeIncludedInSynValSpfnAndMember.fsi (5,13--5,23)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
index d5d5241d319..eeefac8eb15 100644
--- a/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi.bsl
@@ -112,4 +112,4 @@ SigFile
              Namespace
                /root/SignatureType/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
index b3b90078243..a0531c3b4b9 100644
--- a/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi.bsl
@@ -77,4 +77,4 @@ SigFile
              Module
                /root/SignatureType/RangeOfMembersShouldBeIncludedInSynExceptionSigAndSynModuleSigDeclException.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
index a8bfdf5d39a..580866f473e 100644
--- a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi.bsl
@@ -67,4 +67,4 @@ SigFile
              Namespace
                /root/SignatureType/RangeOfSynTypeDefnSigDelegateOfShouldStartFromName.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
index caf461db3e9..5b48b2b70ae 100644
--- a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi.bsl
@@ -60,4 +60,4 @@ SigFile
              Namespace
                /root/SignatureType/RangeOfSynTypeDefnSigObjectModelShouldEndAtLastMember.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
index e94bab3d665..2627a538a1e 100644
--- a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi.bsl
@@ -69,4 +69,4 @@ SigFile
              Namespace
                /root/SignatureType/RangeOfSynTypeDefnSigRecordShouldEndAtLastMember.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
index 79d6dcf40e8..f9270e4d152 100644
--- a/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi.bsl
@@ -60,4 +60,4 @@ SigFile
              Namespace
                /root/SignatureType/RangeOfSynTypeDefnSigSimpleShouldEndAtLastVal.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
index 6766b16ec50..049d714c1f8 100644
--- a/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi.bsl
@@ -33,4 +33,4 @@ SigFile
         CodeComments =
          [LineComment
             /root/SignatureType/RangeOfTypeShouldEndAtEndKeyword.fsi (9,0--9,6)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
index fee9619b4bc..536bc47948e 100644
--- a/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
@@ -54,4 +54,4 @@ SigFile
              Namespace
                /root/SignatureType/SynExceptionSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
index 9d5e4b248d0..a6b61362afc 100644
--- a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi.bsl
@@ -60,4 +60,4 @@ SigFile
              Namespace
                /root/SignatureType/SynTypeDefnSigShouldContainsTheRangeOfTheWithKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
index ada0314afea..13fe57b944e 100644
--- a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -56,4 +56,4 @@ SigFile
              Namespace
                /root/SignatureType/SynTypeDefnSigWithEnumContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
index 166ca5cd134..1b2d2c17209 100644
--- a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -32,4 +32,4 @@ SigFile
              Namespace
                /root/SignatureType/SynTypeDefnSigWithObjectModelClassContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
index 0e5d6eaeba1..865f7959402 100644
--- a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -68,4 +68,4 @@ SigFile
              Namespace
                /root/SignatureType/SynTypeDefnSigWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
index 8a2c9af80a3..421c6c0e714 100644
--- a/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi.bsl
@@ -75,4 +75,4 @@ SigFile
              Namespace
                /root/SignatureType/SynTypeDefnSigWithUnionContainsTheRangeOfTheEqualsSign.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl
index a6c5cec0a12..f3ba581c260 100644
--- a/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/SynValSigContainsParameterNames.fsi.bsl
@@ -88,4 +88,4 @@ SigFile
              Module
                /root/SignatureType/SynValSigContainsParameterNames.fsi (2,0--2,6) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
index 20230e04965..0cf89703fcf 100644
--- a/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi.bsl
@@ -139,4 +139,4 @@ SigFile
             /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (10,0--10,5);
           EndIf
             /root/SignatureType/TriviaIsPresentInSynTypeDefnSig.fsi (12,0--12,6)]
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl b/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl
index f929741142c..b3abb80d5f9 100644
--- a/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SignatureType/ValKeywordIsPresentInSynValSig.fsi.bsl
@@ -40,4 +40,4 @@ SigFile
         CodeComments =
          [LineComment
             /root/SignatureType/ValKeywordIsPresentInSynValSig.fsi (5,0--5,6)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl
index ad1250bd595..fdae2939e13 100644
--- a/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl
+++ b/tests/service/data/SyntaxTree/SourceIdentifier/_LINE_.fs.bsl
@@ -13,4 +13,4 @@ ImplFile
           None, /root/SourceIdentifier/_LINE_.fs (2,0--2,8),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl
index 27a9e24a612..b4bc6df914d 100644
--- a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl
+++ b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl
@@ -15,4 +15,4 @@ ImplFile
           /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (2,0--2,20),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl
index d563efde7c1..126d1dd8b56 100644
--- a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl
+++ b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEFILE_.fs.bsl
@@ -15,4 +15,4 @@ ImplFile
           /root/SourceIdentifier/_SOURCEFILE_.fs (2,0--2,15),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl
index 012885fa39f..afd05f918ef 100644
--- a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl
@@ -35,4 +35,4 @@ ImplFile
           /root/String/SynConstBytesWithSynByteStringKindRegular.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
index 55ef939a4fd..50d8e81f40a 100644
--- a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
@@ -35,4 +35,4 @@ ImplFile
           /root/String/SynConstBytesWithSynByteStringKindVerbatim.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl
index 7f1223d846e..6a24f7335fb 100644
--- a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl
@@ -35,4 +35,4 @@ ImplFile
           /root/String/SynConstStringWithSynStringKindRegular.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl
index fd78fdc258a..aee5064a8f8 100644
--- a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl
@@ -33,4 +33,4 @@ ImplFile
           /root/String/SynConstStringWithSynStringKindTripleQuote.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl
index 7617bad6abc..8115f93c79a 100644
--- a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl
@@ -35,4 +35,4 @@ ImplFile
           /root/String/SynConstStringWithSynStringKindVerbatim.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
index 97f8d8a0e2d..24165475322 100644
--- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
@@ -45,4 +45,4 @@ ImplFile
           /root/String/SynExprInterpolatedStringWithSynStringKindRegular.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
index d6e001b4456..111a9e64a4a 100644
--- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
@@ -36,4 +36,4 @@ ImplFile
           /root/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
index 66623dcda74..dbc5c6e913c 100644
--- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
@@ -47,4 +47,4 @@ ImplFile
           /root/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent.fs.bsl b/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent.fs.bsl
index aed18e91e1c..4909368f748 100644
--- a/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynIdent/IncompleteLongIdent.fs.bsl
@@ -17,4 +17,4 @@ ImplFile
           { LeadingKeyword =
              Module /root/SynIdent/IncompleteLongIdent.fs (2,0--2,6) })],
       (true, false), { ConditionalDirectives = []
-                       CodeComments = [] }, set []))
\ No newline at end of file
+                       CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
index 80ea6d1837b..d5e01328b25 100644
--- a/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
@@ -149,4 +149,4 @@ ImplFile
           /root/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl
index 1c28ecab911..73bf249f376 100644
--- a/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl
@@ -227,4 +227,4 @@ ImplFile
           /root/SynType/SingleSynTypeInsideSynExprTraitCall.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl
index 0733758a660..f639df7aff7 100644
--- a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl
@@ -121,4 +121,4 @@ ImplFile
           /root/SynType/SynTypeOrInsideSynExprTraitCall.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
index be6aaa43454..e71b4015362 100644
--- a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
@@ -113,4 +113,4 @@ ImplFile
           /root/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
index 439840c44b8..4e7d042dd0d 100644
--- a/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
@@ -91,4 +91,4 @@ ImplFile
           /root/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
index bd6fe455130..55edda4d425 100644
--- a/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi.bsl
@@ -133,4 +133,4 @@ SigFile
           PreXmlDocEmpty, [], None,
           /root/SynType/SynTypeTupleDoesIncludeLeadingParameterAttributes.fsi (2,0--4,0),
           { LeadingKeyword = None })], { ConditionalDirectives = []
-                                         CodeComments = [] }, set []))
\ No newline at end of file
+                                         CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
index 5afa85a88a0..59878664c62 100644
--- a/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi.bsl
@@ -74,4 +74,4 @@ SigFile
           PreXmlDocEmpty, [], None,
           /root/SynType/SynTypeTupleDoesIncludeLeadingParameterName.fsi (2,0--4,0),
           { LeadingKeyword = None })], { ConditionalDirectives = []
-                                         CodeComments = [] }, set []))
\ No newline at end of file
+                                         CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl b/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl
index 58dfd7643e5..9b5e7784c36 100644
--- a/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/AttributesInOptionalNamedMemberParameter.fs.bsl
@@ -109,4 +109,4 @@ ImplFile
           /root/Type/AttributesInOptionalNamedMemberParameter.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl b/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
index 5c8312ee9ed..ceb9817585d 100644
--- a/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs.bsl
@@ -53,4 +53,4 @@ ImplFile
           /root/Type/MultipleSynEnumCaseContainsRangeOfConstant.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl b/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl
index 1d8c450a135..080321c49c9 100644
--- a/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/NamedParametersInDelegateType.fs.bsl
@@ -113,4 +113,4 @@ ImplFile
           /root/Type/NamedParametersInDelegateType.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
index 6d4ec1f7ddf..36e1ebd9acf 100644
--- a/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs.bsl
@@ -49,4 +49,4 @@ ImplFile
           /root/Type/NestedTypeHasStaticTypeAsLeadingKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl b/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
index cd7a1680ff5..d87e47627e8 100644
--- a/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs.bsl
@@ -40,4 +40,4 @@ ImplFile
           /root/Type/RangeOfAttributeShouldBeIncludedInSynTypeDefn.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl b/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
index 133ba788016..ade3f244e75 100644
--- a/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs.bsl
@@ -167,4 +167,4 @@ ImplFile
           /root/Type/RangeOfAttributesShouldBeIncludedInRecursiveTypes.fs (2,0--11,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl b/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
index 261c0a1ba69..10659885ffd 100644
--- a/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SingleSynEnumCaseContainsRangeOfConstant.fs.bsl
@@ -39,4 +39,4 @@ ImplFile
           /root/Type/SingleSynEnumCaseContainsRangeOfConstant.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
index 60f6862c75d..b3d689aaa15 100644
--- a/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -101,4 +101,4 @@ ImplFile
           /root/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
index 0b8ad451653..b473f2f7277 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs.bsl
@@ -48,4 +48,4 @@ ImplFile
         CodeComments =
          [LineComment
             /root/Type/SynTypeDefnWithAttributeContainsTheRangeOfTheTypeKeyword.fs (3,0--3,8)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
index c70f9d30ea4..8e32e4da7c4 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -65,4 +65,4 @@ ImplFile
           /root/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
index 9a4e870e164..90dba14f089 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -55,4 +55,4 @@ ImplFile
           /root/Type/SynTypeDefnWithEnumContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
index 1d5e8c5486c..ea694f862e8 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -50,4 +50,4 @@ ImplFile
           /root/Type/SynTypeDefnWithObjectModelClassContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
index 9971bb1c6a9..a958c6315a9 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -68,4 +68,4 @@ ImplFile
           /root/Type/SynTypeDefnWithObjectModelDelegateContainsTheRangeOfTheEqualsSign.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
index ab4e74b38c5..d9da3c99c50 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -105,4 +105,4 @@ ImplFile
           /root/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs (2,0--6,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
index 4b7410bce73..63c551513b7 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -74,4 +74,4 @@ ImplFile
           /root/Type/SynTypeDefnWithUnionContainsTheRangeOfTheEqualsSign.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
index 949c267131a..9083cbe4a54 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs.bsl
@@ -56,4 +56,4 @@ ImplFile
         CodeComments =
          [LineComment
             /root/Type/SynTypeDefnWithXmlDocContainsTheRangeOfTheTypeKeyword.fs (3,0--3,8)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl
index 84a1e998e39..1190681063d 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeFunHasRangeOfArrow.fs.bsl
@@ -35,4 +35,4 @@ ImplFile
       { ConditionalDirectives = []
         CodeComments =
          [LineComment /root/Type/SynTypeFunHasRangeOfArrow.fs (2,19--2,59)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl
index afbf5bfe691..056a5f66457 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl
@@ -45,4 +45,4 @@ ImplFile
           [], None, /root/Type/SynTypeTupleWithStruct.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl
index 8d0b757f195..369912a054f 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl
@@ -51,4 +51,4 @@ ImplFile
           /root/Type/SynTypeTupleWithStructRecovery.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl
index 0c27b0e7e9f..bc4950f61ec 100644
--- a/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/UnionCase/MultipleSynUnionCasesHaveBarRange.fs.bsl
@@ -64,4 +64,4 @@ ImplFile
           /root/UnionCase/MultipleSynUnionCasesHaveBarRange.fs (2,0--5,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl
index b8ffb3a68c7..c2a7ffdab50 100644
--- a/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/UnionCase/PrivateKeywordHasRange.fs.bsl
@@ -53,4 +53,4 @@ ImplFile
         CodeComments =
          [LineComment /root/UnionCase/PrivateKeywordHasRange.fs (3,4--3,67);
           LineComment /root/UnionCase/PrivateKeywordHasRange.fs (4,4--4,56)] },
-      set []))
\ No newline at end of file
+      set []))
diff --git a/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl
index 04e5949e8c5..5d8ec00dfaa 100644
--- a/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl
+++ b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseHasBarRange.fs.bsl
@@ -47,4 +47,4 @@ ImplFile
           /root/UnionCase/SingleSynUnionCaseHasBarRange.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl
index c043b8f2f2b..757804b04fd 100644
--- a/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl
+++ b/tests/service/data/SyntaxTree/UnionCase/SingleSynUnionCaseWithoutBar.fs.bsl
@@ -45,4 +45,4 @@ ImplFile
           /root/UnionCase/SingleSynUnionCaseWithoutBar.fs (2,0--3,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl
index eef2d79488c..05e3a6e2d14 100644
--- a/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl
+++ b/tests/service/data/SyntaxTree/UnionCase/SynUnionCaseKindFullType.fs.bsl
@@ -52,4 +52,4 @@ ImplFile
           /root/UnionCase/SynUnionCaseKindFullType.fs (2,0--4,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl
index 9be48963645..4f4432943f1 100644
--- a/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl
+++ b/tests/service/data/SyntaxTree/UnionCase/UnionCaseFieldsCanHaveComments.fs.bsl
@@ -55,4 +55,4 @@ ImplFile
           /root/UnionCase/UnionCaseFieldsCanHaveComments.fs (2,0--9,0),
           { LeadingKeyword = None })], (true, false),
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl b/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl
index 1a220189c43..9a321495bc3 100644
--- a/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl
+++ b/tests/service/data/SyntaxTree/Val/InlineKeyword.fsi.bsl
@@ -24,4 +24,4 @@ SigFile
           None, /root/Val/InlineKeyword.fsi (2,0--4,26),
           { LeadingKeyword = Namespace /root/Val/InlineKeyword.fsi (2,0--2,9) })],
       { ConditionalDirectives = []
-        CodeComments = [] }, set []))
\ No newline at end of file
+        CodeComments = [] }, set []))

From 030bf0eaf2f27645147f24edefaf23a1c447ae22 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Thu, 9 Feb 2023 13:19:25 +0100
Subject: [PATCH 7/8] Take __SOURCE_DIRECTORY__ result into account.

---
 tests/service/SyntaxTreeTests.fs                           | 7 ++++++-
 .../SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl   | 2 +-
 .../SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl   | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/service/SyntaxTreeTests.fs b/tests/service/SyntaxTreeTests.fs
index fa7e2342aff..bdcf5b096b9 100644
--- a/tests/service/SyntaxTreeTests.fs
+++ b/tests/service/SyntaxTreeTests.fs
@@ -47,7 +47,12 @@ let ParseFile fileName =
     let contents = File.ReadAllText fullPath
     let ast = parseSourceCode (fileName, contents)
 
-    let normalize (s: string) = s.Replace("\r", "")
+    let normalize (s: string) =
+        s
+            .Replace("\r", "")
+            // __SOURCE_DIRECTORY__ could evaluate to C:\root on Windows.
+            .Replace(@"C:\root\", "/root/")
+
     let actual = sprintf "%A" ast |> normalize |> sprintf "%s\n"
     let bslPath = $"{fullPath}.bsl"
 
diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
index 92e955b4c84..a24d5a54228 100644
--- a/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
+++ b/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
@@ -9,7 +9,7 @@ ImplFile
              (ParsedHashDirective
                 ("I",
                  [SourceIdentifier
-                    ("__SOURCE_DIRECTORY__", "C:\root\ParsedHashDirective",
+                    ("__SOURCE_DIRECTORY__", "/root/ParsedHashDirective",
                      /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,3--2,23))],
                  /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23)),
               /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23))],
diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl
index b4bc6df914d..4006508f4d1 100644
--- a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl
+++ b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl
@@ -7,7 +7,7 @@ ImplFile
           [Expr
              (Const
                 (SourceIdentifier
-                   ("__SOURCE_DIRECTORY__", "C:\root\SourceIdentifier",
+                   ("__SOURCE_DIRECTORY__", "/root/SourceIdentifier",
                     /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (2,0--2,20)),
                  /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (2,0--2,20)),
               /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (2,0--2,20))],

From a2c2335bbae0262d6b9573c70ef9f0f8e521edd4 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Thu, 9 Feb 2023 16:21:39 +0100
Subject: [PATCH 8/8] Sanitize AST for current __SOURCE_DIRECTORY__ usage.

---
 tests/service/SyntaxTreeTests.fs              | 116 ++++++++++++++++--
 ...tifierAsParsedHashDirectiveArgument.fs.bsl |   4 +-
 .../SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl |   6 +-
 3 files changed, 113 insertions(+), 13 deletions(-)

diff --git a/tests/service/SyntaxTreeTests.fs b/tests/service/SyntaxTreeTests.fs
index bdcf5b096b9..89688b3e114 100644
--- a/tests/service/SyntaxTreeTests.fs
+++ b/tests/service/SyntaxTreeTests.fs
@@ -3,6 +3,7 @@ module Tests.Service.SyntaxTree
 open System.IO
 open FSharp.Compiler.CodeAnalysis
 open FSharp.Compiler.Service.Tests.Common
+open FSharp.Compiler.Syntax
 open FSharp.Compiler.Text
 open NUnit.Framework
 
@@ -19,6 +20,109 @@ let allTestCases =
 [<Literal>]
 let RootDirectory = @"/root"
 
+/// <summary>
+/// Everytime `__SOURCE_DIRECTORY__` was used in the code, the ast will contain an invalid value and range for it.
+/// This should be cleaned up when the test runs during CI/CD.
+/// </summary>
+/// <remarks>
+/// This function is incomplete and does not clean up the entire ParsedInput.
+/// A shortcut was made to only support the existing use-cases.
+/// </remarks>
+let private sanitizeAST (sourceDirectoryValue: string) (ast: ParsedInput) : ParsedInput =
+    let isZero (m: range) =
+        m.StartLine = 0 && m.StartColumn = 0 && m.EndLine = 0 && m.EndColumn = 0
+
+    // __SOURCE_DIRECTORY__ will contain the evaluated value, so we want to replace it with a stable value instead.
+    let mapParsedHashDirective (ParsedHashDirective(ident, args, _) as phd) =
+        match args with
+        | [ ParsedHashDirectiveArgument.SourceIdentifier("__SOURCE_DIRECTORY__", _, mSourceDirectory) ] ->
+            let mZero =
+                Range.mkRange mSourceDirectory.FileName (Position.mkPos 0 0) (Position.mkPos 0 0)
+
+            ParsedHashDirective(
+                ident,
+                [ ParsedHashDirectiveArgument.SourceIdentifier("__SOURCE_DIRECTORY__", sourceDirectoryValue, mZero) ],
+                mZero
+            )
+        | _ -> phd
+
+    let (|SourceDirectoryConstant|_|) (constant: SynConst) =
+        match constant with
+        | SynConst.SourceIdentifier("__SOURCE_DIRECTORY__", _, mSourceDirectory) ->
+            let mZero =
+                Range.mkRange mSourceDirectory.FileName (Position.mkPos 0 0) (Position.mkPos 0 0)
+
+            Some(SynConst.SourceIdentifier("__SOURCE_DIRECTORY__", sourceDirectoryValue, mZero), mZero)
+        | _ -> None
+
+    let (|SourceDirectoryConstantExpr|_|) (expr: SynExpr) =
+        match expr with
+        | SynExpr.Const(SourceDirectoryConstant(constant, mZero), _) -> Some(SynExpr.Const(constant, mZero))
+        | _ -> None
+
+    let rec mapSynModuleDecl (mdl: SynModuleDecl) =
+        match mdl with
+        | SynModuleDecl.HashDirective(ParsedHashDirective(range = mZero) as hd, m) ->
+            let hd = mapParsedHashDirective hd
+            // Only update the range of SynModuleSigDecl.HashDirective if the value was updated.
+            let m = if isZero mZero then mZero else m
+            SynModuleDecl.HashDirective(hd, m)
+        | SynModuleDecl.NestedModule(moduleInfo, isRecursive, decls, isContinuing, range, trivia) ->
+            SynModuleDecl.NestedModule(moduleInfo, isRecursive, List.map mapSynModuleDecl decls, isContinuing, range, trivia)
+        | SynModuleDecl.Expr(SourceDirectoryConstantExpr(expr), _) -> SynModuleDecl.Expr(expr, expr.Range)
+        | _ -> mdl
+
+    let mapSynModuleOrNamespace (SynModuleOrNamespace(longId, isRecursive, kind, decls, xmlDoc, attribs, ao, range, trivia)) =
+        SynModuleOrNamespace(longId, isRecursive, kind, List.map mapSynModuleDecl decls, xmlDoc, attribs, ao, range, trivia)
+
+    let rec mapSynModuleDeclSig (msdl: SynModuleSigDecl) =
+        match msdl with
+        | SynModuleSigDecl.HashDirective(ParsedHashDirective(range = mZero) as hd, m) ->
+            let hd = mapParsedHashDirective hd
+            // Only update the range of SynModuleSigDecl.HashDirective if the value was updated.
+            let m = if isZero mZero then mZero else m
+            SynModuleSigDecl.HashDirective(hd, m)
+        | SynModuleSigDecl.NestedModule(moduleInfo, isRecursive, decls, range, trivia) ->
+            SynModuleSigDecl.NestedModule(moduleInfo, isRecursive, List.map mapSynModuleDeclSig decls, range, trivia)
+        | _ -> msdl
+
+    let mapSynModuleOrNamespaceSig (SynModuleOrNamespaceSig(longId, isRecursive, kind, decls, xmlDoc, attribs, ao, range, trivia)) =
+        SynModuleOrNamespaceSig(longId, isRecursive, kind, List.map mapSynModuleDeclSig decls, xmlDoc, attribs, ao, range, trivia)
+
+    match ast with
+    | ParsedInput.ImplFile(ParsedImplFileInput(fileName,
+                                               isScript,
+                                               qualifiedNameOfFile,
+                                               scopedPragmas,
+                                               hashDirectives,
+                                               contents,
+                                               flags,
+                                               trivia,
+                                               identifiers)) ->
+        ParsedImplFileInput(
+            fileName,
+            isScript,
+            qualifiedNameOfFile,
+            scopedPragmas,
+            List.map mapParsedHashDirective hashDirectives,
+            List.map mapSynModuleOrNamespace contents,
+            flags,
+            trivia,
+            identifiers
+        )
+        |> ParsedInput.ImplFile
+    | ParsedInput.SigFile(ParsedSigFileInput(fileName, qualifiedNameOfFile, scopedPragmas, hashDirectives, contents, trivia, identifiers)) ->
+        ParsedSigFileInput(
+            fileName,
+            qualifiedNameOfFile,
+            scopedPragmas,
+            List.map mapParsedHashDirective hashDirectives,
+            List.map mapSynModuleOrNamespaceSig contents,
+            trivia,
+            identifiers
+        )
+        |> ParsedInput.SigFile
+
 let parseSourceCode (name: string, code: string) =
     let location = Path.Combine(RootDirectory, name).Replace("\\", "/")
 
@@ -31,7 +135,9 @@ let parseSourceCode (name: string, code: string) =
         )
         |> Async.RunImmediate
 
-    parseResults.ParseTree
+    let tree = parseResults.ParseTree
+    let sourceDirectoryValue = $"{RootDirectory}/{FileInfo(location).Directory.Name}"
+    sanitizeAST sourceDirectoryValue tree
 
 /// Asserts the parsed untyped tree matches the expected baseline.
 ///
@@ -46,13 +152,7 @@ let ParseFile fileName =
     let fullPath = Path.Combine(testCasesDir, fileName)
     let contents = File.ReadAllText fullPath
     let ast = parseSourceCode (fileName, contents)
-
-    let normalize (s: string) =
-        s
-            .Replace("\r", "")
-            // __SOURCE_DIRECTORY__ could evaluate to C:\root on Windows.
-            .Replace(@"C:\root\", "/root/")
-
+    let normalize (s: string) = s.Replace("\r", "")
     let actual = sprintf "%A" ast |> normalize |> sprintf "%s\n"
     let bslPath = $"{fullPath}.bsl"
 
diff --git a/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl b/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
index a24d5a54228..a8d2b112f79 100644
--- a/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
+++ b/tests/service/data/SyntaxTree/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs.bsl
@@ -10,8 +10,8 @@ ImplFile
                 ("I",
                  [SourceIdentifier
                     ("__SOURCE_DIRECTORY__", "/root/ParsedHashDirective",
-                     /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,3--2,23))],
-                 /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23)),
+                     /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (0,0--0,0))],
+                 /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (0,0--0,0)),
               /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23))],
           PreXmlDocEmpty, [], None,
           /root/ParsedHashDirective/SourceIdentifierAsParsedHashDirectiveArgument.fs (2,0--2,23),
diff --git a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl
index 4006508f4d1..cff3c8ddb5b 100644
--- a/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl
+++ b/tests/service/data/SyntaxTree/SourceIdentifier/_SOURCEDIRECTORY_.fs.bsl
@@ -8,9 +8,9 @@ ImplFile
              (Const
                 (SourceIdentifier
                    ("__SOURCE_DIRECTORY__", "/root/SourceIdentifier",
-                    /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (2,0--2,20)),
-                 /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (2,0--2,20)),
-              /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (2,0--2,20))],
+                    /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (0,0--0,0)),
+                 /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (0,0--0,0)),
+              /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (0,0--0,0))],
           PreXmlDocEmpty, [], None,
           /root/SourceIdentifier/_SOURCEDIRECTORY_.fs (2,0--2,20),
           { LeadingKeyword = None })], (true, false),