Module names can't have dashes, fix test fixtures