Refactored away paths from functional register test code