Merge "Resolved the error with "make test""