Fixed tests :)