Small tweaks to make tests pass on julia 0.4
Merge pull request #137 from JuliaLang/teh/julia0.4

Small tweaks to make tests pass on julia 0.4