Issue #12: tests passing