Make tests pass for full tox suite