Add more named variables, catch exceptions in the testing script