Improve lower-case and upper-case robusntess, add test for premature failure