Changed conditions to conform to other tests