Make test names more consistent

@shans