diff --git a/src/Spectre.Console.Tests/Unit/BoxBorderTests.AsciiBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/BoxBorderTests.AsciiBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/BoxBorderTests.AsciiBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/BoxBorderTests.AsciiBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/BoxBorderTests.DoubleBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/BoxBorderTests.DoubleBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/BoxBorderTests.DoubleBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/BoxBorderTests.DoubleBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/BoxBorderTests.HeavyBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/BoxBorderTests.HeavyBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/BoxBorderTests.HeavyBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/BoxBorderTests.HeavyBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/BoxBorderTests.NoBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/BoxBorderTests.NoBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/BoxBorderTests.NoBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/BoxBorderTests.NoBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/BoxBorderTests.RoundedBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/BoxBorderTests.RoundedBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/BoxBorderTests.RoundedBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/BoxBorderTests.RoundedBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/BoxBorderTests.SquareBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/BoxBorderTests.SquareBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/BoxBorderTests.SquareBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/BoxBorderTests.SquareBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/CalendarTests.Should_Center_Calendar_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/CalendarTests.Should_Center_Calendar_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/CalendarTests.Should_Center_Calendar_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/CalendarTests.Should_Center_Calendar_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/CalendarTests.Should_Left_Align_Calendar_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/CalendarTests.Should_Left_Align_Calendar_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/CalendarTests.Should_Left_Align_Calendar_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/CalendarTests.Should_Left_Align_Calendar_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/CalendarTests.Should_Render_Calendar_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/CalendarTests.Should_Render_Calendar_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/CalendarTests.Should_Render_Calendar_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/CalendarTests.Should_Render_Calendar_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/CalendarTests.Should_Render_Calendar_Correctly_For_Specific_Culture.verified.txt b/src/Spectre.Console.Tests/Expectations/CalendarTests.Should_Render_Calendar_Correctly_For_Specific_Culture.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/CalendarTests.Should_Render_Calendar_Correctly_For_Specific_Culture.verified.txt rename to src/Spectre.Console.Tests/Expectations/CalendarTests.Should_Render_Calendar_Correctly_For_Specific_Culture.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/CalendarTests.Should_Right_Align_Calendar_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/CalendarTests.Should_Right_Align_Calendar_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/CalendarTests.Should_Right_Align_Calendar_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/CalendarTests.Should_Right_Align_Calendar_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/ColumnsTests.Should_Render_Columns_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/ColumnsTests.Should_Render_Columns_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/ColumnsTests.Should_Render_Columns_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/ColumnsTests.Should_Render_Columns_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/ExceptionTests.Should_Write_Exception.verified.txt b/src/Spectre.Console.Tests/Expectations/ExceptionTests.Should_Write_Exception.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/ExceptionTests.Should_Write_Exception.verified.txt rename to src/Spectre.Console.Tests/Expectations/ExceptionTests.Should_Write_Exception.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/ExceptionTests.Should_Write_Exception_With_Inner_Exception.verified.txt b/src/Spectre.Console.Tests/Expectations/ExceptionTests.Should_Write_Exception_With_Inner_Exception.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/ExceptionTests.Should_Write_Exception_With_Inner_Exception.verified.txt rename to src/Spectre.Console.Tests/Expectations/ExceptionTests.Should_Write_Exception_With_Inner_Exception.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/ExceptionTests.Should_Write_Exception_With_Shortened_Methods.verified.txt b/src/Spectre.Console.Tests/Expectations/ExceptionTests.Should_Write_Exception_With_Shortened_Methods.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/ExceptionTests.Should_Write_Exception_With_Shortened_Methods.verified.txt rename to src/Spectre.Console.Tests/Expectations/ExceptionTests.Should_Write_Exception_With_Shortened_Methods.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/ExceptionTests.Should_Write_Exception_With_Shortened_Types.verified.txt b/src/Spectre.Console.Tests/Expectations/ExceptionTests.Should_Write_Exception_With_Shortened_Types.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/ExceptionTests.Should_Write_Exception_With_Shortened_Types.verified.txt rename to src/Spectre.Console.Tests/Expectations/ExceptionTests.Should_Write_Exception_With_Shortened_Types.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/GridTests.Should_Render_Explicit_Grid_Column_Padding_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/GridTests.Should_Render_Explicit_Grid_Column_Padding_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/GridTests.Should_Render_Explicit_Grid_Column_Padding_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/GridTests.Should_Render_Explicit_Grid_Column_Padding_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/GridTests.Should_Render_Grid.verified.txt b/src/Spectre.Console.Tests/Expectations/GridTests.Should_Render_Grid.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/GridTests.Should_Render_Grid.verified.txt rename to src/Spectre.Console.Tests/Expectations/GridTests.Should_Render_Grid.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/GridTests.Should_Render_Grid_Column_Alignment_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/GridTests.Should_Render_Grid_Column_Alignment_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/GridTests.Should_Render_Grid_Column_Alignment_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/GridTests.Should_Render_Grid_Column_Alignment_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/GridTests.Should_Render_Grid_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/GridTests.Should_Render_Grid_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/GridTests.Should_Render_Grid_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/GridTests.Should_Render_Grid_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/GridTests.Should_Use_Default_Padding.verified.txt b/src/Spectre.Console.Tests/Expectations/GridTests.Should_Use_Default_Padding.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/GridTests.Should_Use_Default_Padding.verified.txt rename to src/Spectre.Console.Tests/Expectations/GridTests.Should_Use_Default_Padding.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/GridTests.TheAddEmptyRowMethod.Should_Add_Empty_Row.verified.txt b/src/Spectre.Console.Tests/Expectations/GridTests.TheAddEmptyRowMethod.Should_Add_Empty_Row.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/GridTests.TheAddEmptyRowMethod.Should_Add_Empty_Row.verified.txt rename to src/Spectre.Console.Tests/Expectations/GridTests.TheAddEmptyRowMethod.Should_Add_Empty_Row.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/GridTests.TheAddEmptyRowMethod.Should_Add_Empty_Row_At_The_End.verified.txt b/src/Spectre.Console.Tests/Expectations/GridTests.TheAddEmptyRowMethod.Should_Add_Empty_Row_At_The_End.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/GridTests.TheAddEmptyRowMethod.Should_Add_Empty_Row_At_The_End.verified.txt rename to src/Spectre.Console.Tests/Expectations/GridTests.TheAddEmptyRowMethod.Should_Add_Empty_Row_At_The_End.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PadderTests.Should_Render_Expanded_Padded_Object_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/PadderTests.Should_Render_Expanded_Padded_Object_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PadderTests.Should_Render_Expanded_Padded_Object_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/PadderTests.Should_Render_Expanded_Padded_Object_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PadderTests.Should_Render_Padded_Object_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/PadderTests.Should_Render_Padded_Object_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PadderTests.Should_Render_Padded_Object_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/PadderTests.Should_Render_Padded_Object_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PadderTests.Should_Render_Padded_Object_Correctly_When_Nested_Within_Other_Object.verified.txt b/src/Spectre.Console.Tests/Expectations/PadderTests.Should_Render_Padded_Object_Correctly_When_Nested_Within_Other_Object.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PadderTests.Should_Render_Padded_Object_Correctly_When_Nested_Within_Other_Object.verified.txt rename to src/Spectre.Console.Tests/Expectations/PadderTests.Should_Render_Padded_Object_Correctly_When_Nested_Within_Other_Object.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Center_Child_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Center_Child_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Center_Child_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Center_Child_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Collapse_Header_If_It_Will_Not_Fit.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Collapse_Header_If_It_Will_Not_Fit.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Collapse_Header_If_It_Will_Not_Fit.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Collapse_Header_If_It_Will_Not_Fit.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Expand_Panel_If_Enabled.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Expand_Panel_If_Enabled.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Expand_Panel_If_Enabled.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Expand_Panel_If_Enabled.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Justify_Child_To_Right_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Justify_Child_To_Right_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Justify_Child_To_Right_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Justify_Child_To_Right_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Preserve_Explicit_Line_Ending.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Preserve_Explicit_Line_Ending.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Preserve_Explicit_Line_Ending.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Preserve_Explicit_Line_Ending.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_Inside_Panel_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_Inside_Panel_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_Inside_Panel_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_Inside_Panel_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Centered_Header.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Centered_Header.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Centered_Header.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Centered_Header.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Header.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Header.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Header.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Header.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Left_Aligned_Header.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Left_Aligned_Header.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Left_Aligned_Header.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Left_Aligned_Header.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Multiple_Lines.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Multiple_Lines.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Multiple_Lines.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Multiple_Lines.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Padding.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Padding.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Padding.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Padding.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Padding_Set_To_Zero.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Padding_Set_To_Zero.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Padding_Set_To_Zero.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Padding_Set_To_Zero.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Right_Aligned_Header.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Right_Aligned_Header.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Right_Aligned_Header.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Right_Aligned_Header.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Unicode_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Unicode_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Render_Panel_With_Unicode_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Render_Panel_With_Unicode_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.Should_Wrap_Content_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/PanelTests.Should_Wrap_Content_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PanelTests.Should_Wrap_Content_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/PanelTests.Should_Wrap_Content_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PromptTests.Should_Accept_Choice_In_List.verified.txt b/src/Spectre.Console.Tests/Expectations/PromptTests.Should_Accept_Choice_In_List.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PromptTests.Should_Accept_Choice_In_List.verified.txt rename to src/Spectre.Console.Tests/Expectations/PromptTests.Should_Accept_Choice_In_List.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PromptTests.Should_Chose_Default_Value_If_Nothing_Is_Entered.verified.txt b/src/Spectre.Console.Tests/Expectations/PromptTests.Should_Chose_Default_Value_If_Nothing_Is_Entered.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PromptTests.Should_Chose_Default_Value_If_Nothing_Is_Entered.verified.txt rename to src/Spectre.Console.Tests/Expectations/PromptTests.Should_Chose_Default_Value_If_Nothing_Is_Entered.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PromptTests.Should_Return_Error_If_An_Invalid_Choice_Is_Made.verified.txt b/src/Spectre.Console.Tests/Expectations/PromptTests.Should_Return_Error_If_An_Invalid_Choice_Is_Made.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PromptTests.Should_Return_Error_If_An_Invalid_Choice_Is_Made.verified.txt rename to src/Spectre.Console.Tests/Expectations/PromptTests.Should_Return_Error_If_An_Invalid_Choice_Is_Made.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PromptTests.Should_Return_Error_If_Custom_Validation_Fails.verified.txt b/src/Spectre.Console.Tests/Expectations/PromptTests.Should_Return_Error_If_Custom_Validation_Fails.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PromptTests.Should_Return_Error_If_Custom_Validation_Fails.verified.txt rename to src/Spectre.Console.Tests/Expectations/PromptTests.Should_Return_Error_If_Custom_Validation_Fails.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/PromptTests.Should_Return_Validation_Error_If_Value_Cannot_Be_Converted.verified.txt b/src/Spectre.Console.Tests/Expectations/PromptTests.Should_Return_Validation_Error_If_Value_Cannot_Be_Converted.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/PromptTests.Should_Return_Validation_Error_If_Value_Cannot_Be_Converted.verified.txt rename to src/Spectre.Console.Tests/Expectations/PromptTests.Should_Return_Validation_Error_If_Value_Cannot_Be_Converted.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/RecorderTests.Should_Export_Html_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/RecorderTests.Should_Export_Html_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/RecorderTests.Should_Export_Html_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/RecorderTests.Should_Export_Html_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/RecorderTests.Should_Export_Text_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/RecorderTests.Should_Export_Text_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/RecorderTests.Should_Export_Text_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/RecorderTests.Should_Export_Text_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/RowsTests.Should_Render_Rows.verified.txt b/src/Spectre.Console.Tests/Expectations/RowsTests.Should_Render_Rows.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/RowsTests.Should_Render_Rows.verified.txt rename to src/Spectre.Console.Tests/Expectations/RowsTests.Should_Render_Rows.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/RowsTests.Should_Render_Rows_Correctly_Inside_Other_Widget.verified.txt b/src/Spectre.Console.Tests/Expectations/RowsTests.Should_Render_Rows_Correctly_Inside_Other_Widget.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/RowsTests.Should_Render_Rows_Correctly_Inside_Other_Widget.verified.txt rename to src/Spectre.Console.Tests/Expectations/RowsTests.Should_Render_Rows_Correctly_Inside_Other_Widget.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/RowsTests.Should_Render_Rows_Correctly_Inside_Other_Widget_When_Expanded.verified.txt b/src/Spectre.Console.Tests/Expectations/RowsTests.Should_Render_Rows_Correctly_Inside_Other_Widget_When_Expanded.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/RowsTests.Should_Render_Rows_Correctly_Inside_Other_Widget_When_Expanded.verified.txt rename to src/Spectre.Console.Tests/Expectations/RowsTests.Should_Render_Rows_Correctly_Inside_Other_Widget_When_Expanded.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/RuleTests.Should_Convert_Line_Breaks_In_Title_To_Spaces.verified.txt b/src/Spectre.Console.Tests/Expectations/RuleTests.Should_Convert_Line_Breaks_In_Title_To_Spaces.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/RuleTests.Should_Convert_Line_Breaks_In_Title_To_Spaces.verified.txt rename to src/Spectre.Console.Tests/Expectations/RuleTests.Should_Convert_Line_Breaks_In_Title_To_Spaces.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/RuleTests.Should_Render_Default_Rule_With_Specified_Box.verified.txt b/src/Spectre.Console.Tests/Expectations/RuleTests.Should_Render_Default_Rule_With_Specified_Box.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/RuleTests.Should_Render_Default_Rule_With_Specified_Box.verified.txt rename to src/Spectre.Console.Tests/Expectations/RuleTests.Should_Render_Default_Rule_With_Specified_Box.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/RuleTests.Should_Render_Default_Rule_With_Title_Centered_By_Default.verified.txt b/src/Spectre.Console.Tests/Expectations/RuleTests.Should_Render_Default_Rule_With_Title_Centered_By_Default.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/RuleTests.Should_Render_Default_Rule_With_Title_Centered_By_Default.verified.txt rename to src/Spectre.Console.Tests/Expectations/RuleTests.Should_Render_Default_Rule_With_Title_Centered_By_Default.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/RuleTests.Should_Render_Default_Rule_With_Title_Left_Aligned.verified.txt b/src/Spectre.Console.Tests/Expectations/RuleTests.Should_Render_Default_Rule_With_Title_Left_Aligned.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/RuleTests.Should_Render_Default_Rule_With_Title_Left_Aligned.verified.txt rename to src/Spectre.Console.Tests/Expectations/RuleTests.Should_Render_Default_Rule_With_Title_Left_Aligned.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/RuleTests.Should_Render_Default_Rule_With_Title_Right_Aligned.verified.txt b/src/Spectre.Console.Tests/Expectations/RuleTests.Should_Render_Default_Rule_With_Title_Right_Aligned.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/RuleTests.Should_Render_Default_Rule_With_Title_Right_Aligned.verified.txt rename to src/Spectre.Console.Tests/Expectations/RuleTests.Should_Render_Default_Rule_With_Title_Right_Aligned.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/RuleTests.Should_Render_Default_Rule_Without_Title.verified.txt b/src/Spectre.Console.Tests/Expectations/RuleTests.Should_Render_Default_Rule_Without_Title.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/RuleTests.Should_Render_Default_Rule_Without_Title.verified.txt rename to src/Spectre.Console.Tests/Expectations/RuleTests.Should_Render_Default_Rule_Without_Title.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/RuleTests.Should_Render_With_Specified_Box.verified.txt b/src/Spectre.Console.Tests/Expectations/RuleTests.Should_Render_With_Specified_Box.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/RuleTests.Should_Render_With_Specified_Box.verified.txt rename to src/Spectre.Console.Tests/Expectations/RuleTests.Should_Render_With_Specified_Box.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/RuleTests.Should_Truncate_Title.verified.txt b/src/Spectre.Console.Tests/Expectations/RuleTests.Should_Truncate_Title.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/RuleTests.Should_Truncate_Title.verified.txt rename to src/Spectre.Console.Tests/Expectations/RuleTests.Should_Truncate_Title.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/SegmentTests.TheSplitLinesMethod.Should_Split_Segment.verified.txt b/src/Spectre.Console.Tests/Expectations/SegmentTests.TheSplitLinesMethod.Should_Split_Segment.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/SegmentTests.TheSplitLinesMethod.Should_Split_Segment.verified.txt rename to src/Spectre.Console.Tests/Expectations/SegmentTests.TheSplitLinesMethod.Should_Split_Segment.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/SegmentTests.TheSplitLinesMethod.Should_Split_Segments_With_Linebreak_In_Text.verified.txt b/src/Spectre.Console.Tests/Expectations/SegmentTests.TheSplitLinesMethod.Should_Split_Segments_With_Linebreak_In_Text.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/SegmentTests.TheSplitLinesMethod.Should_Split_Segments_With_Linebreak_In_Text.verified.txt rename to src/Spectre.Console.Tests/Expectations/SegmentTests.TheSplitLinesMethod.Should_Split_Segments_With_Linebreak_In_Text.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/SegmentTests.TheSplitMethod.Should_Split_Segment_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/SegmentTests.TheSplitMethod.Should_Split_Segment_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/SegmentTests.TheSplitMethod.Should_Split_Segment_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/SegmentTests.TheSplitMethod.Should_Split_Segment_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.Ascii2Border.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.Ascii2Border.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.Ascii2Border.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.Ascii2Border.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.AsciiBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.AsciiBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.AsciiBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.AsciiBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.AsciiDoubleHeadBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.AsciiDoubleHeadBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.AsciiDoubleHeadBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.AsciiDoubleHeadBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.DoubleBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.DoubleBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.DoubleBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.DoubleBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.DoubleEdgeBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.DoubleEdgeBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.DoubleEdgeBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.DoubleEdgeBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.HeavyBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.HeavyBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.HeavyBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.HeavyBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.HeavyEdgeBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.HeavyEdgeBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.HeavyEdgeBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.HeavyEdgeBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.HeavyHeadBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.HeavyHeadBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.HeavyHeadBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.HeavyHeadBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.HorizontalBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.HorizontalBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.HorizontalBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.HorizontalBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.MarkdownBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.MarkdownBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.MarkdownBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.MarkdownBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.MarkdownBorder.Should_Render_Center_Aligned_Table_Columns_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.MarkdownBorder.Should_Render_Center_Aligned_Table_Columns_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.MarkdownBorder.Should_Render_Center_Aligned_Table_Columns_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.MarkdownBorder.Should_Render_Center_Aligned_Table_Columns_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.MarkdownBorder.Should_Render_Left_Aligned_Table_Columns_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.MarkdownBorder.Should_Render_Left_Aligned_Table_Columns_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.MarkdownBorder.Should_Render_Left_Aligned_Table_Columns_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.MarkdownBorder.Should_Render_Left_Aligned_Table_Columns_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.MarkdownBorder.Should_Render_Right_Aligned_Table_Columns_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.MarkdownBorder.Should_Render_Right_Aligned_Table_Columns_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.MarkdownBorder.Should_Render_Right_Aligned_Table_Columns_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.MarkdownBorder.Should_Render_Right_Aligned_Table_Columns_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.MinimalBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.MinimalBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.MinimalBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.MinimalBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.MinimalDoubleHeadBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.MinimalDoubleHeadBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.MinimalDoubleHeadBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.MinimalDoubleHeadBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.MinimalHeavyHeadBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.MinimalHeavyHeadBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.MinimalHeavyHeadBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.MinimalHeavyHeadBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.NoBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.NoBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.NoBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.NoBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.RoundedBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.RoundedBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.RoundedBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.RoundedBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.SimpleBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.SimpleBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.SimpleBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.SimpleBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.SimpleHeavyBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.SimpleHeavyBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.SimpleHeavyBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.SimpleHeavyBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.SquareBorder.Should_Render_As_Expected.verified.txt b/src/Spectre.Console.Tests/Expectations/TableBorderTests.SquareBorder.Should_Render_As_Expected.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableBorderTests.SquareBorder.Should_Render_As_Expected.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableBorderTests.SquareBorder.Should_Render_As_Expected.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Center_Table_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Center_Table_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Center_Table_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Center_Table_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Center_Table_With_Title_And_Caption_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Center_Table_With_Title_And_Caption_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Center_Table_With_Title_And_Caption_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Center_Table_With_Title_And_Caption_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Expand_Table_To_Available_Space_If_Specified.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Expand_Table_To_Available_Space_If_Specified.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Expand_Table_To_Available_Space_If_Specified.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Expand_Table_To_Available_Space_If_Specified.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Left_Align_Table_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Left_Align_Table_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Left_Align_Table_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Left_Align_Table_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Left_Align_Table_With_Title_And_Caption_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Left_Align_Table_With_Title_And_Caption_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Left_Align_Table_With_Title_And_Caption_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Left_Align_Table_With_Title_And_Caption_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Not_Draw_Tables_That_Are_Impossible_To_Draw.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Not_Draw_Tables_That_Are_Impossible_To_Draw.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Not_Draw_Tables_That_Are_Impossible_To_Draw.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Not_Draw_Tables_That_Are_Impossible_To_Draw.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_Nested_In_Panels_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_Nested_In_Panels_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_Nested_In_Panels_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_Nested_In_Panels_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_With_Cell_Padding_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_With_Cell_Padding_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_With_Cell_Padding_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_With_Cell_Padding_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_With_Column_Justification_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_With_Column_Justification_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_With_Column_Justification_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_With_Column_Justification_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_With_Footers_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_With_Footers_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_With_Footers_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_With_Footers_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_With_Multiple_Rows_In_Cell_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_With_Multiple_Rows_In_Cell_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_With_Multiple_Rows_In_Cell_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_With_Multiple_Rows_In_Cell_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_With_No_Border_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_With_No_Border_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_With_No_Border_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_With_No_Border_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_With_Title_And_Caption_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_With_Title_And_Caption_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_With_Title_And_Caption_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_With_Title_And_Caption_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_Without_Rows.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_Without_Rows.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Render_Table_Without_Rows.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Render_Table_Without_Rows.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Right_Align_Table_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Right_Align_Table_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Right_Align_Table_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Right_Align_Table_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.Should_Right_Align_Table_With_Title_And_Caption_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.Should_Right_Align_Table_With_Title_And_Caption_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.Should_Right_Align_Table_With_Title_And_Caption_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.Should_Right_Align_Table_With_Title_And_Caption_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Unit/TableTests.TheAddEmptyRowMethod.Should_Render_Table_Correctly.verified.txt b/src/Spectre.Console.Tests/Expectations/TableTests.TheAddEmptyRowMethod.Should_Render_Table_Correctly.verified.txt similarity index 100% rename from src/Spectre.Console.Tests/Unit/TableTests.TheAddEmptyRowMethod.Should_Render_Table_Correctly.verified.txt rename to src/Spectre.Console.Tests/Expectations/TableTests.TheAddEmptyRowMethod.Should_Render_Table_Correctly.verified.txt diff --git a/src/Spectre.Console.Tests/Spectre.Console.Tests.csproj b/src/Spectre.Console.Tests/Spectre.Console.Tests.csproj index de28ce9..c731be4 100644 --- a/src/Spectre.Console.Tests/Spectre.Console.Tests.csproj +++ b/src/Spectre.Console.Tests/Spectre.Console.Tests.csproj @@ -8,7 +8,7 @@ - + all @@ -20,12 +20,4 @@ - - - $([System.String]::Copy('%(FileName)').Split('.')[0]) - $(ProjectExt.Replace('proj', '')) - %(ParentFile)%(ParentExtension) - - - diff --git a/src/Spectre.Console.Tests/TestConfig.cs b/src/Spectre.Console.Tests/TestConfig.cs new file mode 100644 index 0000000..1ca1730 --- /dev/null +++ b/src/Spectre.Console.Tests/TestConfig.cs @@ -0,0 +1,23 @@ +using System.IO; +using System.Runtime.CompilerServices; + +namespace Spectre.Console.Tests +{ + public static class TestConfig + { + [ModuleInitializer] + public static void Init() + { + VerifyTests.VerifierSettings.DeriveTestDirectory((_, directory) => + { + var expectations = Path.Combine(directory, "Expectations"); + if (!Directory.Exists(expectations)) + { + Directory.CreateDirectory(expectations); + } + + return expectations; + }); + } + } +} \ No newline at end of file