Remove the production flag, remove incorrect plan defaults
added/improved some integration specs
[#41483869]