fixing unit tests related to issue 80 fix