Fixing bad expected results

[#69360024]
Removing tests for functionality to be deprecated

[#69360024]