fixed test and until