Test new FEATURE directive and refactor groveller tests
Test new FEATURE directive and refactor groveller tests

stassats/cffi,dkochmanski/cffi,cffi/cffi,3b/cffi,3b/cffi,dkochmanski/cffi,cffi/cffi,stassats/cffi,cffi/cffi,dkochmanski/cffi,3b/cffi,stassats/cffi