Changed test to openMP + some more imple