Updates for newest teststrap rules