Fixed some tests errors