Adapted unit tests to support the new portability patch