Add missing destructor to mock
Fixing enum scoping
Merge branch 'dev' into abstract