Selftest.
Rename solution.
Minor cleanup