Add another test; change naming of cases- names that happen to match typenames are bad