Simplify these tests
wip: first pass at fixing validation