Merged updated test from upstream fork