Maybe send this as a separate PR?  No need to hold-up improvements on the shared code by addition of a test.