Added tests and solutions
Added solution tests
Fixed tests