clean up initfirst regress conflict created by my import. split tests
into two sub dirs.