Switch to org.junit; tidy up and reformat
Update tasks to reflect new approach to license families