Feature/200 test coverage

Fixes #200. (Actually, the error handling test coverage was good, what needed additional test coverage was TDTM, since we have deleted the files that we didn't need anymore after deciding to go with the Objects option.)