You probably lucked out if you found a DL office that really knew what the non-CDL is supposed to entail. The one I went too were confused on what is included on the driving test. One thought the air brake test was required, the other said it is not, another didn't know. One said certain paperwork is required to be carried, the other said it is not. There were a few other things also but minor. Each just kinda did their own thing. DPS Austin headquarters might have known but it depends on who you ask. The wife and I both got ours but it was a chore to get the people on the right page in understanding which chapters of the CDL actually apply. That was the worst part of the test.