Added tests for choice type
Corrected col distance check
Added metavars for choice test