#280 #151 fixing tests
Merge pull request #324 from DevYah/T5_mahmoudeldesouky_5.12

#280 #151 fixing tests