registration refactorings and test stabilizations