Pull Request: Fixed some tests

@ahmedhagii @KhaledHelmy