Add unit tests for PR #33