Fixed tests + typo