last version and fixed test