Fixed failing tests (on travis).