Pull in DougReeder's changes

Unit test alone is a nice addition.