Improve primitive-element testing a lot. Now much more sensible and