Add few identifier tests.
Fix up some identifier code.

Now allows multiple primes in a row, primes in the middle etc. etc.