Added tests
Changed calculate pay & mileage