Merge "Add junit tests for CreateAAIVfModule"