TST: more fixes