Simplify the test code - create autonyms dynamically

Change-Id: Ie71963cb28a6346155dba065480be9601d48dea9