Testing should accept functions, not just Features
Merge branch 'api-documentation' into develop