Cleaning up upstream tests

I don't think I made any meaningful changes to code, but please review :)
@hash3g ah, this was bad :)
```
$ git pull; sudo python setup.py install
Already up-to-date.
Password:
  File "setup.py", line 20
    msg = 'Python module `fontforge` is required. ' +
                                                    ^
SyntaxError: invalid syntax
```