Added SimpleSolution unit test.

Also changed some formatting.