Fix code to keep CI server JUnits happy