8808de0b45
* Improve error handling and update tests * Assert errors are nil * Refactor away redundant code
* Improve error handling and update tests * Assert errors are nil * Refactor away redundant code