Fixed repeatable tests