Revert "Revert "Ready for multi machien test""

This reverts commit 3c4dbc7e6522e4918820399aca485749fb727dba.