[Issue #94] Fixed tests

@mostafahassaan