tweaked error handling and updated all tests