Format source.
Remove references to junit.framework (fixes WFE-1052).