Fix test and resurrect #7 for fc95eae