Fixed non-deterministic tests
Merge pull request #15 from mo-nathan/travis

Fixed non-deterministic tests