Made tests tougher