Cleanup tests/ packaging

Details in the commit messages.