Make tests compile again.
Merge pull request #75 from alberts/master

Make tests compile again.