Added test and partial for registration