decouple implementation codes with steps codes
Merge pull request #1 from lidingshan/master

Decouple implementation codes with test codes