Resolved multi-platform test issues.