fix tests + manual check