Making the test pass (but more must be done) on issue #64.