Fix junit compile fails due to data structure moves