Fixed model_fit.py and tests so they would work with the new separate_bvals.

Fixed some file_paths in tests.