Fixes for the Autonym test

Change-Id: Ic8d8eca516cfefc523fca0257ae1f14ea9b64d1b