New units

This is gh-1265, with four extra commits for cleaning up old jars and making tests pass.

This is not currently in the breaking queue, so the merge jobs should be checked for passing status.