New tests, new logic for non-alphanumerics