C3 mahmoud hashish #89 #90 #234 fix

Issues #89 #90 #234 
@marwa-mehanna @hishamelgezeery @omar-kassem please review Code, Scenario, Tests to merge to master