Fixed tests even more