890016 Update tests to use unsupported application handling, rather than try/catch