Increase app coverage, fix some API calls on python 2