Final fixed test