Fix resolve_app and start testing it
Rename callback to app to be more descriptive of it's actual use