Copy/Adapt relevant tests from Istanbul