TST: minor modifications