More testing script and fixes to validation