Changed default for wrapAround to True, updated sp unit test to reflect new
column mapping.