Added OMP and tests