Merge "Add more openmp tests"