PR #123: Fixed unit tests