Refactor to use only one expectations pr it