remove unneeded try/catch, update test