Use exception-raising methods, not returning ones
Remove duplicated test