Remove only from test
Extract expandenv