[Issue #96] Fixing unit tests