alphabetize properly, fix tests