Fixed up and re-enabled registry tests