Update tests to reflect hyphen support