Added solution tests
Fixed tests