Improve test coverage
Merge branch 'new-app'