updated tests to work on Linux, fixed #213
Merge pull request #214 from timgraham/fixed_tests

updated tests to work on Linux, fixed #213