Fix for test remarks issue 6981