Fixes tests broken by Daniel
Merge pull request #59 from dbeckwith/fixTests

Fixes tests