Changes

Making quite a few changes, mainly based upon me getting 'validation'
and 'test' the wrong way round