fix bug and comment out broken test