Timo fixing tests

@SalmaFG