Don't exclude util / EnvironmentType despte no tests, clean up assertion msgs