Fix test name
Add exception handling