Improve one packaging test, remove a setuptoolism in another
2 files changed