Fixed tests errors