Define RUBY_PATH for tests
Simplify tests
wip: first pass at fixing validation