ENH: Use strings, better tests, and coverage