Change solution file and add test