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