Fixing validator bug and starting work on Validator testing
Merge branch 'lee-dev' of github.com:lnewson/csprocessor into lee-dev