Remove unnecessary dev dependencies
Additions to tests
Added additional error conditions