fixed test
fixed/extended test