Improve UT by evaluating manually solution