Rename test methods
Implement configuration control for cleaning of server roles.
Reorganise older tests.