More work on Irrigation and unit testing.