Fix tests due to methods being changed to static
Merge pull request #105 from dbeckwith/fixTests

Fix tests due to methods being changed to static