Fixed tests :thumbsup: