Update tests for portability.