TST: fixed up some tests