Updating code to fix project and tests

Fixes #91