Move control, leader, state workers into dedicated ns' and update tests
Make the stupid test faster.
Fix slight macro bug :P