General tidying up and adding support for SoilDataFaker.
Unit tests still failing.