Align test with latest changes