Improved omacp methods
Merge pull request #541 from owdqa/feature/add_omacp_test

Improved omacp methods