More validation tests
Also split test data for validation tests into a separate class