updating tests for master
updating tests for master
Merge pull request #1 from Gradfly/updatingmaster

Updating tests so master builds properly