Fix broken refactor; make util junit test compilation work