Move more registration tests to new style