Fail loudly when flow registry options are changed
Fix tests to reset registry instance where necessary