Merge pull request #76 from tianon/fix-broken-eagle-tests

Fix the tests, too