Updated validation of tests and cleaned up script.