Fix the failing tests.

Hello @sshaw,

I've read your recent message to me posted at the issue #3.

Don't know whether this is what you're looking for, but I can offer only these fixes.

Best regards.