Simplify these tests
Check existence rather than rescue exceptions
wip: first pass at fixing validation