ENH: Tests pass