Fixing tests

@m0hamed