test fixes...
Merge pull request #75 from spenceralger/master

Fixed jenkins tests