Merge tests from 3.5