Attempt to fix test: make it more system-agnostic.