Small fixes to pass tests

rstnet still fails in test_from_taxipp