Added the annotation registry calls and fixed the tests