Add tests. Refactor and clean up
Merge branch 'master' of github.com:konstantinkoval/Sweet