Fix two tests that didn't pass - neither for me nor for Travis
Not so sure about this one, but looks plausible and is the current result from the filter
Merge pull request #520 from mpdude/fix-tests

Fix two tests that didn't pass - neither for me nor for Travis