removed extra stepsand hard coded values [KFSQA-728]