updated conformance tests
Merge branch 'feature/reregistration'