Use deeper tests for REGISTER
Clean up REGISTER code