Added another file to the SolutionTest.
Merge finished.