Tests errors fixed