fix Unit tests and refactoring
Merge branch 'master' of https://github.com/rvirin/SoundCloud