fixed tests and hyphen between header and suffix