add substr
rearrange tests