Issue #88 Fixed unit tests because of the changes