Continue converting test
Improve steps algorithm implementation

Update a few tests
Merge pull request #14 from shmed/master

Continue converting test and improve steps algorithm implementation