The changes to make suffix more general mean that it can't be tested from
POLARIS unit tests any more, so a suffix has been added to the POLARIS
unit test as well