Fix JUnits; still one major TODO preventing prime-time usage.