Merge in twill tests, create twill test for app.py