Unit tests working for PR#78