Added test 21. All except example 7 is working.
Merge branch 'master' of https://github.com/edisonm/refactor