Fixed to stop using geven-when
Merge branch 'hotfix/stop_using_given-when'
Fixed to stop using geven-when in tests
Updated META