fixd unittest and calls