Fix tests per refactorings