Issue #257 - Fix failing unit tests

All tests that were failing are now working.