Fix layout test

Sorry for the reformatting of the code, it was filled with tabs.
Merge branch 'Service-Statemachine'