As we discussed, I'll do the massive move later :). Can you move the tests over to the worker and remove this?