Tdd fixes
Merge branch 'master' of https://github.com/Pellared/Examples.git