Final test fixed