kwchen3 ssong 25 : removing unncessary tests