Fix tests for rust upgrade
Merge pull request #23 from larsbergstrom/rustup_20140410

Fix tests for rust upgrade