Tests for T8326
Tests for T6018