Fixed failing test that was brought from 2.5 code