TST: remove more double calls