Merge "remove dashes and and sort tests"