Making test more cross-platform