Change solution structure, change unit tests