ENH: More complete test