Update setup.py; rework test batching