Updated tests
Removed unnecessary error handling