Fix for running test_from_taxipp
FC1 merge 2