added some tests
removed app numbers
Merge branch 'master' into stable