Add some more tests - programmatic validation instead of parsing