Add messages for init action.
Tests now clean up.