Fix tests when run against 1.5.0.

Fixes #59