Fixed some repeated tests