add test cases for Step4
implements for green on Step4
Merge branch 'step-4'