Fix tentancy tests