Change regexp to handle degenerate chars, all tests pass