TST: tests now pass, but more tests are needed