Fixes to Tests

- Now runs with testr
- flake8 skips contrib