Redo startsWith/endsWith tests