Name *-test.* to *_test.*, for consistency.