Fixed some tests that occasionaly failed