Pass through errors correctly from DefaultApp convenience methods.
Remove an unnecessary internal condition.
Refactor some simple tests.