Fixed many tests