Add additional test and fixes to ensure that results are the same when