Fix registration tests in release-0.12.0 branch