organize imports, tuned
clean up ValidationMatchers and add tests