TST: tests pass now