Merge pull request #47 from plondon/master

fix merge conflicts from test files