Adding tests related to 3.5.1