merged the test
fix the test
avoid NPE
remove copy/paste error
Account Registration objects
idm changes