Expand the whitespace test and fix the trailing spacing.