Updated to add registration helpers and added tests for those helpers