update for merge, test for error parsing
Updating error object and test