remove code duplications
Remove code duplications
rename test methods and try to make test simpler
Merge branch 'master' of https://github.com/manuc66/TedOffline