Refactored chart step definitions  [KFSQA-1065]