add test + small fix for other test