fixing broken test after merge