Mostly working etest.

Still struggling with perl updates for the self test but we'll see what
happens.