Closes #2 (closed)
No idea what was the issue, but seems to be working for me, and tests are passing.