reorganized for clear ordering of events during startup,
splitted test configuration,
modified tests to fitthe new ordering