Cleanup inside solution files.
Fixed broken test.