restore default mandatory callout behavior for register
Test fixes