More safety around node flag changes and more configurable tests