up to date with upstream master, re-configure both emit tests