Add 4ShouldReturn22
Refactor the codes