Issue #78, Add tests