Merge pull request #1 from RobynSeverson/develop

fix to tests
updating validation