update app init api
merge upstream
class / scope tests
scope fix
update tests
Merge pull request #26 from funkytek/master

scope fix, updated tests