Revert upstream test file for backwards compatibility