Tidy up test.s
Test openmp backend in make test.
More test changes.