TST: Minor changes