diff --git a/pywr-schema/src/test_models/inflow.csv b/pywr-schema/src/test_models/inflow.csv
index 07f79268..b6f2ad0c 100644
--- a/pywr-schema/src/test_models/inflow.csv
+++ b/pywr-schema/src/test_models/inflow.csv
@@ -1,366 +1,366 @@
-date,inflow1
-01/01/2021,1
-02/01/2021,2
-03/01/2021,3
-04/01/2021,4
-05/01/2021,5
-06/01/2021,6
-07/01/2021,7
-08/01/2021,8
-09/01/2021,9
-10/01/2021,10
-11/01/2021,11
-12/01/2021,12
-13/01/2021,13
-14/01/2021,14
-15/01/2021,15
-16/01/2021,16
-17/01/2021,17
-18/01/2021,18
-19/01/2021,19
-20/01/2021,20
-21/01/2021,21
-22/01/2021,22
-23/01/2021,23
-24/01/2021,24
-25/01/2021,25
-26/01/2021,26
-27/01/2021,27
-28/01/2021,28
-29/01/2021,29
-30/01/2021,30
-31/01/2021,31
-01/02/2021,1
-02/02/2021,2
-03/02/2021,3
-04/02/2021,4
-05/02/2021,5
-06/02/2021,6
-07/02/2021,7
-08/02/2021,8
-09/02/2021,9
-10/02/2021,10
-11/02/2021,11
-12/02/2021,12
-13/02/2021,13
-14/02/2021,14
-15/02/2021,15
-16/02/2021,16
-17/02/2021,17
-18/02/2021,18
-19/02/2021,19
-20/02/2021,20
-21/02/2021,21
-22/02/2021,22
-23/02/2021,23
-24/02/2021,24
-25/02/2021,25
-26/02/2021,26
-27/02/2021,27
-28/02/2021,28
-01/03/2021,1
-02/03/2021,2
-03/03/2021,3
-04/03/2021,4
-05/03/2021,5
-06/03/2021,6
-07/03/2021,7
-08/03/2021,8
-09/03/2021,9
-10/03/2021,10
-11/03/2021,11
-12/03/2021,12
-13/03/2021,13
-14/03/2021,14
-15/03/2021,15
-16/03/2021,16
-17/03/2021,17
-18/03/2021,18
-19/03/2021,19
-20/03/2021,20
-21/03/2021,21
-22/03/2021,22
-23/03/2021,23
-24/03/2021,24
-25/03/2021,25
-26/03/2021,26
-27/03/2021,27
-28/03/2021,28
-29/03/2021,29
-30/03/2021,30
-31/03/2021,31
-01/04/2021,1
-02/04/2021,2
-03/04/2021,3
-04/04/2021,4
-05/04/2021,5
-06/04/2021,6
-07/04/2021,7
-08/04/2021,8
-09/04/2021,9
-10/04/2021,10
-11/04/2021,11
-12/04/2021,12
-13/04/2021,13
-14/04/2021,14
-15/04/2021,15
-16/04/2021,16
-17/04/2021,17
-18/04/2021,18
-19/04/2021,19
-20/04/2021,20
-21/04/2021,21
-22/04/2021,22
-23/04/2021,23
-24/04/2021,24
-25/04/2021,25
-26/04/2021,26
-27/04/2021,27
-28/04/2021,28
-29/04/2021,29
-30/04/2021,30
-01/05/2021,1
-02/05/2021,2
-03/05/2021,3
-04/05/2021,4
-05/05/2021,5
-06/05/2021,6
-07/05/2021,7
-08/05/2021,8
-09/05/2021,9
-10/05/2021,10
-11/05/2021,11
-12/05/2021,12
-13/05/2021,13
-14/05/2021,14
-15/05/2021,15
-16/05/2021,16
-17/05/2021,17
-18/05/2021,18
-19/05/2021,19
-20/05/2021,20
-21/05/2021,21
-22/05/2021,22
-23/05/2021,23
-24/05/2021,24
-25/05/2021,25
-26/05/2021,26
-27/05/2021,27
-28/05/2021,28
-29/05/2021,29
-30/05/2021,30
-31/05/2021,31
-01/06/2021,1
-02/06/2021,2
-03/06/2021,3
-04/06/2021,4
-05/06/2021,5
-06/06/2021,6
-07/06/2021,7
-08/06/2021,8
-09/06/2021,9
-10/06/2021,10
-11/06/2021,11
-12/06/2021,12
-13/06/2021,13
-14/06/2021,14
-15/06/2021,15
-16/06/2021,16
-17/06/2021,17
-18/06/2021,18
-19/06/2021,19
-20/06/2021,20
-21/06/2021,21
-22/06/2021,22
-23/06/2021,23
-24/06/2021,24
-25/06/2021,25
-26/06/2021,26
-27/06/2021,27
-28/06/2021,28
-29/06/2021,29
-30/06/2021,30
-01/07/2021,1
-02/07/2021,2
-03/07/2021,3
-04/07/2021,4
-05/07/2021,5
-06/07/2021,6
-07/07/2021,7
-08/07/2021,8
-09/07/2021,9
-10/07/2021,10
-11/07/2021,11
-12/07/2021,12
-13/07/2021,13
-14/07/2021,14
-15/07/2021,15
-16/07/2021,16
-17/07/2021,17
-18/07/2021,18
-19/07/2021,19
-20/07/2021,20
-21/07/2021,21
-22/07/2021,22
-23/07/2021,23
-24/07/2021,24
-25/07/2021,25
-26/07/2021,26
-27/07/2021,27
-28/07/2021,28
-29/07/2021,29
-30/07/2021,30
-31/07/2021,31
-01/08/2021,1
-02/08/2021,2
-03/08/2021,3
-04/08/2021,4
-05/08/2021,5
-06/08/2021,6
-07/08/2021,7
-08/08/2021,8
-09/08/2021,9
-10/08/2021,10
-11/08/2021,11
-12/08/2021,12
-13/08/2021,13
-14/08/2021,14
-15/08/2021,15
-16/08/2021,16
-17/08/2021,17
-18/08/2021,18
-19/08/2021,19
-20/08/2021,20
-21/08/2021,21
-22/08/2021,22
-23/08/2021,23
-24/08/2021,24
-25/08/2021,25
-26/08/2021,26
-27/08/2021,27
-28/08/2021,28
-29/08/2021,29
-30/08/2021,30
-31/08/2021,31
-01/09/2021,1
-02/09/2021,2
-03/09/2021,3
-04/09/2021,4
-05/09/2021,5
-06/09/2021,6
-07/09/2021,7
-08/09/2021,8
-09/09/2021,9
-10/09/2021,10
-11/09/2021,11
-12/09/2021,12
-13/09/2021,13
-14/09/2021,14
-15/09/2021,15
-16/09/2021,16
-17/09/2021,17
-18/09/2021,18
-19/09/2021,19
-20/09/2021,20
-21/09/2021,21
-22/09/2021,22
-23/09/2021,23
-24/09/2021,24
-25/09/2021,25
-26/09/2021,26
-27/09/2021,27
-28/09/2021,28
-29/09/2021,29
-30/09/2021,30
-01/10/2021,1
-02/10/2021,2
-03/10/2021,3
-04/10/2021,4
-05/10/2021,5
-06/10/2021,6
-07/10/2021,7
-08/10/2021,8
-09/10/2021,9
-10/10/2021,10
-11/10/2021,11
-12/10/2021,12
-13/10/2021,13
-14/10/2021,14
-15/10/2021,15
-16/10/2021,16
-17/10/2021,17
-18/10/2021,18
-19/10/2021,19
-20/10/2021,20
-21/10/2021,21
-22/10/2021,22
-23/10/2021,23
-24/10/2021,24
-25/10/2021,25
-26/10/2021,26
-27/10/2021,27
-28/10/2021,28
-29/10/2021,29
-30/10/2021,30
-31/10/2021,31
-01/11/2021,1
-02/11/2021,2
-03/11/2021,3
-04/11/2021,4
-05/11/2021,5
-06/11/2021,6
-07/11/2021,7
-08/11/2021,8
-09/11/2021,9
-10/11/2021,10
-11/11/2021,11
-12/11/2021,12
-13/11/2021,13
-14/11/2021,14
-15/11/2021,15
-16/11/2021,16
-17/11/2021,17
-18/11/2021,18
-19/11/2021,19
-20/11/2021,20
-21/11/2021,21
-22/11/2021,22
-23/11/2021,23
-24/11/2021,24
-25/11/2021,25
-26/11/2021,26
-27/11/2021,27
-28/11/2021,28
-29/11/2021,29
-30/11/2021,30
-01/12/2021,1
-02/12/2021,2
-03/12/2021,3
-04/12/2021,4
-05/12/2021,5
-06/12/2021,6
-07/12/2021,7
-08/12/2021,8
-09/12/2021,9
-10/12/2021,10
-11/12/2021,11
-12/12/2021,12
-13/12/2021,13
-14/12/2021,14
-15/12/2021,15
-16/12/2021,16
-17/12/2021,17
-18/12/2021,18
-19/12/2021,19
-20/12/2021,20
-21/12/2021,21
-22/12/2021,22
-23/12/2021,23
-24/12/2021,24
-25/12/2021,25
-26/12/2021,26
-27/12/2021,27
-28/12/2021,28
-29/12/2021,29
-30/12/2021,30
-31/12/2021,31
+date,inflow1
+01/01/2021,1
+02/01/2021,2
+03/01/2021,3
+04/01/2021,4
+05/01/2021,5
+06/01/2021,6
+07/01/2021,7
+08/01/2021,8
+09/01/2021,9
+10/01/2021,10
+11/01/2021,11
+12/01/2021,12
+13/01/2021,13
+14/01/2021,14
+15/01/2021,15
+16/01/2021,16
+17/01/2021,17
+18/01/2021,18
+19/01/2021,19
+20/01/2021,20
+21/01/2021,21
+22/01/2021,22
+23/01/2021,23
+24/01/2021,24
+25/01/2021,25
+26/01/2021,26
+27/01/2021,27
+28/01/2021,28
+29/01/2021,29
+30/01/2021,30
+31/01/2021,31
+01/02/2021,1
+02/02/2021,2
+03/02/2021,3
+04/02/2021,4
+05/02/2021,5
+06/02/2021,6
+07/02/2021,7
+08/02/2021,8
+09/02/2021,9
+10/02/2021,10
+11/02/2021,11
+12/02/2021,12
+13/02/2021,13
+14/02/2021,14
+15/02/2021,15
+16/02/2021,16
+17/02/2021,17
+18/02/2021,18
+19/02/2021,19
+20/02/2021,20
+21/02/2021,21
+22/02/2021,22
+23/02/2021,23
+24/02/2021,24
+25/02/2021,25
+26/02/2021,26
+27/02/2021,27
+28/02/2021,28
+01/03/2021,1
+02/03/2021,2
+03/03/2021,3
+04/03/2021,4
+05/03/2021,5
+06/03/2021,6
+07/03/2021,7
+08/03/2021,8
+09/03/2021,9
+10/03/2021,10
+11/03/2021,11
+12/03/2021,12
+13/03/2021,13
+14/03/2021,14
+15/03/2021,15
+16/03/2021,16
+17/03/2021,17
+18/03/2021,18
+19/03/2021,19
+20/03/2021,20
+21/03/2021,21
+22/03/2021,22
+23/03/2021,23
+24/03/2021,24
+25/03/2021,25
+26/03/2021,26
+27/03/2021,27
+28/03/2021,28
+29/03/2021,29
+30/03/2021,30
+31/03/2021,31
+01/04/2021,1
+02/04/2021,2
+03/04/2021,3
+04/04/2021,4
+05/04/2021,5
+06/04/2021,6
+07/04/2021,7
+08/04/2021,8
+09/04/2021,9
+10/04/2021,10
+11/04/2021,11
+12/04/2021,12
+13/04/2021,13
+14/04/2021,14
+15/04/2021,15
+16/04/2021,16
+17/04/2021,17
+18/04/2021,18
+19/04/2021,19
+20/04/2021,20
+21/04/2021,21
+22/04/2021,22
+23/04/2021,23
+24/04/2021,24
+25/04/2021,25
+26/04/2021,26
+27/04/2021,27
+28/04/2021,28
+29/04/2021,29
+30/04/2021,30
+01/05/2021,1
+02/05/2021,2
+03/05/2021,3
+04/05/2021,4
+05/05/2021,5
+06/05/2021,6
+07/05/2021,7
+08/05/2021,8
+09/05/2021,9
+10/05/2021,10
+11/05/2021,11
+12/05/2021,12
+13/05/2021,13
+14/05/2021,14
+15/05/2021,15
+16/05/2021,16
+17/05/2021,17
+18/05/2021,18
+19/05/2021,19
+20/05/2021,20
+21/05/2021,21
+22/05/2021,22
+23/05/2021,23
+24/05/2021,24
+25/05/2021,25
+26/05/2021,26
+27/05/2021,27
+28/05/2021,28
+29/05/2021,29
+30/05/2021,30
+31/05/2021,31
+01/06/2021,1
+02/06/2021,2
+03/06/2021,3
+04/06/2021,4
+05/06/2021,5
+06/06/2021,6
+07/06/2021,7
+08/06/2021,8
+09/06/2021,9
+10/06/2021,10
+11/06/2021,11
+12/06/2021,12
+13/06/2021,13
+14/06/2021,14
+15/06/2021,15
+16/06/2021,16
+17/06/2021,17
+18/06/2021,18
+19/06/2021,19
+20/06/2021,20
+21/06/2021,21
+22/06/2021,22
+23/06/2021,23
+24/06/2021,24
+25/06/2021,25
+26/06/2021,26
+27/06/2021,27
+28/06/2021,28
+29/06/2021,29
+30/06/2021,30
+01/07/2021,1
+02/07/2021,2
+03/07/2021,3
+04/07/2021,4
+05/07/2021,5
+06/07/2021,6
+07/07/2021,7
+08/07/2021,8
+09/07/2021,9
+10/07/2021,10
+11/07/2021,11
+12/07/2021,12
+13/07/2021,13
+14/07/2021,14
+15/07/2021,15
+16/07/2021,16
+17/07/2021,17
+18/07/2021,18
+19/07/2021,19
+20/07/2021,20
+21/07/2021,21
+22/07/2021,22
+23/07/2021,23
+24/07/2021,24
+25/07/2021,25
+26/07/2021,26
+27/07/2021,27
+28/07/2021,28
+29/07/2021,29
+30/07/2021,30
+31/07/2021,31
+01/08/2021,1
+02/08/2021,2
+03/08/2021,3
+04/08/2021,4
+05/08/2021,5
+06/08/2021,6
+07/08/2021,7
+08/08/2021,8
+09/08/2021,9
+10/08/2021,10
+11/08/2021,11
+12/08/2021,12
+13/08/2021,13
+14/08/2021,14
+15/08/2021,15
+16/08/2021,16
+17/08/2021,17
+18/08/2021,18
+19/08/2021,19
+20/08/2021,20
+21/08/2021,21
+22/08/2021,22
+23/08/2021,23
+24/08/2021,24
+25/08/2021,25
+26/08/2021,26
+27/08/2021,27
+28/08/2021,28
+29/08/2021,29
+30/08/2021,30
+31/08/2021,31
+01/09/2021,1
+02/09/2021,2
+03/09/2021,3
+04/09/2021,4
+05/09/2021,5
+06/09/2021,6
+07/09/2021,7
+08/09/2021,8
+09/09/2021,9
+10/09/2021,10
+11/09/2021,11
+12/09/2021,12
+13/09/2021,13
+14/09/2021,14
+15/09/2021,15
+16/09/2021,16
+17/09/2021,17
+18/09/2021,18
+19/09/2021,19
+20/09/2021,20
+21/09/2021,21
+22/09/2021,22
+23/09/2021,23
+24/09/2021,24
+25/09/2021,25
+26/09/2021,26
+27/09/2021,27
+28/09/2021,28
+29/09/2021,29
+30/09/2021,30
+01/10/2021,1
+02/10/2021,2
+03/10/2021,3
+04/10/2021,4
+05/10/2021,5
+06/10/2021,6
+07/10/2021,7
+08/10/2021,8
+09/10/2021,9
+10/10/2021,10
+11/10/2021,11
+12/10/2021,12
+13/10/2021,13
+14/10/2021,14
+15/10/2021,15
+16/10/2021,16
+17/10/2021,17
+18/10/2021,18
+19/10/2021,19
+20/10/2021,20
+21/10/2021,21
+22/10/2021,22
+23/10/2021,23
+24/10/2021,24
+25/10/2021,25
+26/10/2021,26
+27/10/2021,27
+28/10/2021,28
+29/10/2021,29
+30/10/2021,30
+31/10/2021,31
+01/11/2021,1
+02/11/2021,2
+03/11/2021,3
+04/11/2021,4
+05/11/2021,5
+06/11/2021,6
+07/11/2021,7
+08/11/2021,8
+09/11/2021,9
+10/11/2021,10
+11/11/2021,11
+12/11/2021,12
+13/11/2021,13
+14/11/2021,14
+15/11/2021,15
+16/11/2021,16
+17/11/2021,17
+18/11/2021,18
+19/11/2021,19
+20/11/2021,20
+21/11/2021,21
+22/11/2021,22
+23/11/2021,23
+24/11/2021,24
+25/11/2021,25
+26/11/2021,26
+27/11/2021,27
+28/11/2021,28
+29/11/2021,29
+30/11/2021,30
+01/12/2021,1
+02/12/2021,2
+03/12/2021,3
+04/12/2021,4
+05/12/2021,5
+06/12/2021,6
+07/12/2021,7
+08/12/2021,8
+09/12/2021,9
+10/12/2021,10
+11/12/2021,11
+12/12/2021,12
+13/12/2021,13
+14/12/2021,14
+15/12/2021,15
+16/12/2021,16
+17/12/2021,17
+18/12/2021,18
+19/12/2021,19
+20/12/2021,20
+21/12/2021,21
+22/12/2021,22
+23/12/2021,23
+24/12/2021,24
+25/12/2021,25
+26/12/2021,26
+27/12/2021,27
+28/12/2021,28
+29/12/2021,29
+30/12/2021,30
+31/12/2021,31