Fix golden tests

Also fixed overlapping CLI flag env vars