Move registration number check to correct place in test order.
Better tests for registration_number state.