Issue #975: Add tests