Feature/mock features

Possible fix for #784