Added expand to spec file
Working expand, expand_ens and swap_row_column