Fixed failing travis tests