Adding outer try/catch. Also adding additonal tests and fixing broken validation tests