Unregister before register for minimal testing