Added auto generated id. Renamed test support classes