3 tests passing

- added error handlers
- changed teardown to avoid error
Passing more tests.

Correcting bugs on the way.