Fix more unit tests.  Clean up some stuff.
Rearrange the ant build a bit.