Merge pull request #69 from jrusbatch/dev

Fix failing unit tests