Fixed unit tests
Refactored Solved class