No, he is right. Despite common sense, the labor test (seeing if an American can do the job the visa holder is currently doing) is applied at green card application time, not at H1B visa time.