Nothing other than one suspicious test in SolutionTests.cs used any
of this, so it's easier to move it all and keep things isolated.