merge with test env