fix tests + 2