changes by swarnlata to fixed testing issues.