a bunch of test reorganization

Standardizing tests across workers