- Don't include Fabric for tests
- Python 3.x compatability