added test function for remap, better handling of single returned values