OR'ing fuel qty masks to avoid invalid sums
Fixed outdated imports in derive_parameters_test.py