Extend feature test macro further