!iam functionality realized
Modified tests