Fix two failing tests unseen by Travis