squash from zoltak branch
rename tests, and add wide variant