improved error handing, more tests